diff options
author | Bobby Rong <rjl931189261@126.com> | 2024-07-14 23:15:43 +0800 |
---|---|---|
committer | Bobby Rong <rjl931189261@126.com> | 2024-07-14 23:15:43 +0800 |
commit | e0b7d441ff1ee7d78b5df51c112d9cb912fbe455 (patch) | |
tree | c369e4b59e8b7bc7159024e06f42fb9a9e9ce99e | |
parent | 9cd3bd81cfc8c063912f90acc831d060495e60cb (diff) |
xreader: Move from cinnamon scope to top-level
-rw-r--r-- | pkgs/by-name/xr/xreader/package.nix (renamed from pkgs/desktops/cinnamon/xreader/default.nix) | 4 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/by-name/xr/xreader/package.nix index 94386d42815fc..b7b966a3b0698 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 e4125ffefcee2..9dad36305ba18 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 } |