nemo-with-extensions: Move from cinnamon scope to top-level

3 files changed, 5 insertions, 5 deletions

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index be64c89b1a50..00533b840bf4 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -104,7 +104,7 @@ in
       services.dbus.packages = with pkgs; [
         cinnamon.cinnamon-common
         cinnamon.cinnamon-screensaver
-        cinnamon.nemo-with-extensions
+        nemo-with-extensions
         xapp
       ];
       services.cinnamon.apps.enable = mkDefault true;
@@ -156,7 +156,7 @@ in
         polkit_gnome
 
         # packages
-        cinnamon.nemo-with-extensions
+        nemo-with-extensions
         gnome-online-accounts-gtk
         cinnamon.cinnamon-control-center
         cinnamon-settings-daemon
diff --git a/pkgs/desktops/cinnamon/nemo/wrapper.nix b/pkgs/by-name/ne/nemo-with-extensions/package.nix
index 2f7216251d20..2c97367695ee 100644
--- a/pkgs/desktops/cinnamon/nemo/wrapper.nix
+++ b/pkgs/by-name/ne/nemo-with-extensions/package.nix
@@ -51,5 +51,5 @@ symlinkJoin {
     done
   '';
 
-  inherit (nemo) meta;
+  meta = builtins.removeAttrs nemo.meta [ "name" "outputsToInstall" "position" ];
 }
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 72ebc54624f5..69193426f29b 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -6,7 +6,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
   cinnamon-session = callPackage ./cinnamon-session { };
-  nemo-with-extensions = callPackage ./nemo/wrapper.nix { };
   muffin = callPackage ./muffin { };
 }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
@@ -30,7 +29,8 @@ lib.makeScope pkgs.newScope (self: with self; {
   nemo-emblems = lib.warn "cinnamon.nemo-emblems was moved to top-level. Please use pkgs.nemo-emblems directly." pkgs.nemo-emblems; # Added on 2024-07-22
   nemo-fileroller = lib.warn "cinnamon.nemo-fileroller was moved to top-level. Please use pkgs.nemo-fileroller directly." pkgs.nemo-fileroller; # Added on 2024-07-22
   nemo-python = lib.warn "cinnamon.nemo-python was moved to top-level. Please use pkgs.nemo-python directly." pkgs.nemo-python; # Added on 2024-07-22
-  nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override cinnamon.nemo-with-extensions."; # Added on 2024-07-14
+  nemo-with-extensions = lib.warn "cinnamon.nemo-with-extensions was moved to top-level. Please use pkgs.nemo-with-extensions directly." pkgs.nemo-with-extensions; # Added on 2024-07-22
+  nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override pkgs.nemo-with-extensions."; # Added on 2024-07-14
   pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14
   warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14
   xapp = lib.warn "cinnamon.xapp was moved to top-level. Please use pkgs.xapp directly." pkgs.xapp; # Added on 2024-07-14