From 02d898772c3ca3ba822d5c045e30c4e747df1c25 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 14 Jul 2024 23:15:43 +0800
Subject: [PATCH] xreader: Move from cinnamon scope to top-level

---
 .../xreader/default.nix => by-name/xr/xreader/package.nix}    | 4 ++--
 pkgs/desktops/cinnamon/default.nix                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/{desktops/cinnamon/xreader/default.nix => by-name/xr/xreader/package.nix} (97%)

diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/by-name/xr/xreader/package.nix
similarity index 97%
rename from pkgs/desktops/cinnamon/xreader/default.nix
rename to pkgs/by-name/xr/xreader/package.nix
index 94386d42815f..b7b966a3b069 100644
--- a/pkgs/desktops/cinnamon/xreader/default.nix
+++ b/pkgs/by-name/xr/xreader/package.nix
@@ -9,7 +9,7 @@
 , wrapGAppsHook3
 , libarchive
 , libxml2
-, xapp
+, cinnamon
 , meson
 , pkg-config
 , cairo
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib
     gtk3
-    xapp
+    cinnamon.xapp
     cairo
     libarchive
     libxml2
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index e4125ffefcee..9dad36305ba1 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/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 { };
-  xreader = callPackage ./xreader { };
   xviewer = callPackage ./xviewer { };
 }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
@@ -55,4 +54,5 @@ lib.makeScope pkgs.newScope (self: with self; {
   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
   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
 }