From 138941d672ee443281aec00f52a892abb96438ff Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Aug 2024 18:33:55 +0200
Subject: [PATCH] gnome-color-manager: Move from gnome scope to top-level

---
 nixos/modules/services/x11/desktop-managers/gnome.nix          | 2 +-
 pkgs/by-name/bu/budgie-control-center/package.nix              | 3 ++-
 .../gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch   | 0
 .../default.nix => by-name/gn/gnome-color-manager/package.nix} | 1 -
 pkgs/desktops/gnome/default.nix                                | 3 +--
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch (100%)
 rename pkgs/{desktops/gnome/core/gnome-color-manager/default.nix => by-name/gn/gnome-color-manager/package.nix} (96%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 2f11e37b87e7..9b17226a5bf1 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -376,7 +376,7 @@ in
             nixos-background-info
             pkgs.gnome-backgrounds
             gnome-bluetooth
-            gnome-color-manager
+            pkgs.gnome-color-manager
             gnome-control-center
             gnome-shell-extensions
             pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
index 65feaa196b9b..418a4d5493f1 100644
--- a/pkgs/by-name/bu/budgie-control-center/package.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -21,6 +21,7 @@
   glib-networking,
   glibc,
   gnome,
+  gnome-color-manager,
   gnome-desktop,
   gnome-user-share,
   gsettings-desktop-schemas,
@@ -78,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     (substituteAll {
       src = ./paths.patch;
       budgie_desktop = budgie-desktop;
-      gcm = gnome.gnome-color-manager;
+      gcm = gnome-color-manager;
       inherit
         cups
         glibc
diff --git a/pkgs/desktops/gnome/core/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch b/pkgs/by-name/gn/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch
rename to pkgs/by-name/gn/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch
diff --git a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix b/pkgs/by-name/gn/gnome-color-manager/package.nix
similarity index 96%
rename from pkgs/desktops/gnome/core/gnome-color-manager/default.nix
rename to pkgs/by-name/gn/gnome-color-manager/package.nix
index afdf6cf3fe92..eddc4c5d432f 100644
--- a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix
+++ b/pkgs/by-name/gn/gnome-color-manager/package.nix
@@ -60,7 +60,6 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-color-manager";
-      attrPath = "gnome.gnome-color-manager";
       freeze = true;
     };
   };
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index ae530b3e6c04..6a4827fae437 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -28,8 +28,6 @@ in
 
   gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { };
 
-  gnome-color-manager = callPackage ./core/gnome-color-manager { };
-
   gnome-control-center = callPackage ./core/gnome-control-center { };
 
   gnome-initial-setup = callPackage ./core/gnome-initial-setup { };
@@ -164,6 +162,7 @@ in
   gnome-boxes = lib.warn "The ‘gnome.gnome-boxes’ was moved to top-level. Please use ‘pkgs.gnome-boxes’ directly." pkgs.gnome-boxes; # Added on 2024-08-11.
   gnome-characters = lib.warn "The ‘gnome.gnome-characters’ was moved to top-level. Please use ‘pkgs.gnome-characters’ directly." pkgs.gnome-characters; # Added on 2024-08-11.
   gnome-clocks = lib.warn "The ‘gnome.gnome-clocks’ was moved to top-level. Please use ‘pkgs.gnome-clocks’ directly." pkgs.gnome-clocks; # Added on 2024-08-11.
+  gnome-color-manager = lib.warn "The ‘gnome.gnome-color-manager’ was moved to top-level. Please use ‘pkgs.gnome-color-manager’ directly." pkgs.gnome-color-manager; # Added on 2024-08-11.
   gnome-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22.
   gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22.
   gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22.