diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-05-25 02:34:21 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2021-06-22 14:38:18 +0200 |
| commit | f5d1823254d5e85014072b6b0dcf9e27ece941ff (patch) | |
| tree | 7ef977e4eefd3a355cdd4d61d4186ec7e894e125 | |
| parent | imagemagick6: 6.9.12-15 -> 6.9.12-16 (diff) | |
| download | nixpkgs-f5d1823254d5e85014072b6b0dcf9e27ece941ff.tar.gz | |
gnomeExtensions: Fix the package names
I did not realize the attribute names are derived from the Nix package names
so I accidentally, renamed them in https://github.com/NixOS/nixpkgs/pull/124295.
(cherry picked from commit 571d540abf447f97b9b4db4a1e0665ec0a4dc06f)
| -rw-r--r-- | pkgs/desktops/gnome/extensions/buildGnomeExtension.nix | 7 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/extensions/default.nix | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix b/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix index 2d12b9983d50..3be7f5c8789a 100644 --- a/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix +++ b/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix @@ -47,8 +47,11 @@ let license = lib.licenses.gpl2Plus; # https://wiki.gnome.org/Projects/GnomeShell/Extensions/Review#Licensing maintainers = with lib.maintainers; [ piegames ]; }; - # Store the extension's UUID, because we might need it at some places - passthru.extensionUuid = uuid; + passthru = { + extensionPortalSlug = pname; + # Store the extension's UUID, because we might need it at some places + extensionUuid = uuid; + }; }; in lib.makeOverridable buildGnomeExtension diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index f74398977021..1ca9a57eb990 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -48,7 +48,7 @@ let )) # Map all extensions to their pname, with potential overwrites (map (extension: - lib.nameValuePair (extensionRenames.${extension.extensionUuid} or extension.pname) extension + lib.nameValuePair (extensionRenames.${extension.extensionUuid} or extension.extensionPortalSlug) extension )) builtins.listToAttrs ]; |