xviewer: Move from cinnamon scope to top-level

pkgs/by-name/xv/xviewer/package.nix

@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, cinnamon-desktop
 , docbook_xsl
 , exempi
 , gdk-pixbuf
@@ -21,7 +20,7 @@
 , pkg-config
 , python3
 , wrapGAppsHook3
-, xapp
+, cinnamon
 , yelp-tools
 }:
 
@@ -37,7 +36,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    cinnamon-desktop
+    cinnamon.cinnamon-desktop
     docbook_xsl
     gdk-pixbuf
     gobject-introspection
@@ -61,7 +60,7 @@ stdenv.mkDerivation rec {
     libpeas
     librsvg
     libxml2
-    xapp
+    cinnamon.xapp
   ];
 
   meta = with lib; {

pkgs/desktops/cinnamon/default.nix

@@ -47,7 +47,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   mint-y-icons = callPackage ./mint-y-icons { };
   muffin = callPackage ./muffin { };
   xapp = callPackage ./xapp { };
-  xviewer = callPackage ./xviewer { };
 }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
   bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
@@ -55,4 +54,5 @@ lib.makeScope pkgs.newScope (self: with self; {
   warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14
   xapps = pkgs.cinnamon.xapp; # added 2022-07-27
   xreader = lib.warn "cinnamon.xreader was moved to top-level. Please use pkgs.xreader directly." pkgs.xreader; # Added on 2024-07-14
+  xviewer = lib.warn "cinnamon.xviewer was moved to top-level. Please use pkgs.xviewer directly." pkgs.xviewer; # Added on 2024-07-14
 }