diff options
| author | piegames <git@piegames.de> | 2021-05-29 17:34:26 +0200 |
|---|---|---|
| committer | piegames <git@piegames.de> | 2021-07-14 03:35:11 +0200 |
| commit | bffbf4617a1bee1ea3889eeb8947b9890d6af8a8 (patch) | |
| tree | 4cc5628958ce9a1c393c8a64d005759af069ee58 /pkgs/desktops/gnome/extensions/default.nix | |
| parent | 6aae2894ef8ae75cc6b07d29853ae8bb1ba96eef (diff) | |
gnomeExtensions: integrate manually packaged extensions better with the others
Their keys are now not used directly. Instead, we go the standard route of mapping to the UUID in order to apply the rename procedure. This makes sure the manual override always does the correct thing, and also gives us more consistency overall.
Diffstat (limited to 'pkgs/desktops/gnome/extensions/default.nix')
| -rw-r--r-- | pkgs/desktops/gnome/extensions/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index a4255411934fd..f98e2fb4e67a3 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -1,5 +1,6 @@ { lib , callPackage +, callPackages , config }: let @@ -60,8 +61,9 @@ in rec { gnome40Extensions = mapUuidNames (produceExtensionsList "40"); gnomeExtensions = lib.recurseIntoAttrs ( - (mapReadableNames (produceExtensionsList "40")) - // (callPackage ./manuallyPackaged.nix {}) + (mapReadableNames + (lib.attrValues (gnome40Extensions // (callPackages ./manuallyPackaged.nix {}))) + ) // lib.optionalAttrs (config.allowAliases or true) { unite-shell = gnomeExtensions.unite; # added 2021-01-19 arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 |