From 00258aaa85731e201aaf93f00f12a5de8d8ca753 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 14 Jul 2024 23:08:22 +0800
Subject: [PATCH] pix: Move from cinnamon scope to top-level

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

diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/by-name/pi/pix/package.nix
similarity index 98%
rename from pkgs/desktops/cinnamon/pix/default.nix
rename to pkgs/by-name/pi/pix/package.nix
index ca16fe960dca..3060544e8471 100644
--- a/pkgs/desktops/cinnamon/pix/default.nix
+++ b/pkgs/by-name/pi/pix/package.nix
@@ -28,7 +28,7 @@
 , python3
 , desktop-file-utils
 , itstool
-, xapp
+, cinnamon
 }:
 
 stdenv.mkDerivation rec {
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     libtiff
     libwebp
     libX11
-    xapp
+    cinnamon.xapp
   ];
 
   postPatch = ''
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index fadc269a6382..b1f4a5bac34a 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -46,7 +46,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   mint-x-icons = callPackage ./mint-x-icons { };
   mint-y-icons = callPackage ./mint-y-icons { };
   muffin = callPackage ./muffin { };
-  pix = callPackage ./pix { };
   xapp = callPackage ./xapp { };
   warpinator = callPackage ./warpinator { };
   xreader = callPackage ./xreader { };
@@ -54,5 +53,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 }) // 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
+  pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14
   xapps = pkgs.cinnamon.xapp; # added 2022-07-27
 }