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

---
 nixos/modules/services/x11/desktop-managers/gnome.nix        | 2 +-
 .../default.nix => by-name/gn/gnome-backgrounds/package.nix} | 5 +----
 .../core => by-name/gn}/gnome-backgrounds/stable-dir.patch   | 0
 pkgs/desktops/gnome/default.nix                              | 3 +--
 4 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{desktops/gnome/core/gnome-backgrounds/default.nix => by-name/gn/gnome-backgrounds/package.nix} (88%)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-backgrounds/stable-dir.patch (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 63d33d306009..2f11e37b87e7 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -374,7 +374,7 @@ in
           optionalPackages = with pkgs.gnome; [
             pkgs.adwaita-icon-theme
             nixos-background-info
-            gnome-backgrounds
+            pkgs.gnome-backgrounds
             gnome-bluetooth
             gnome-color-manager
             gnome-control-center
diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix
similarity index 88%
rename from pkgs/desktops/gnome/core/gnome-backgrounds/default.nix
rename to pkgs/by-name/gn/gnome-backgrounds/package.nix
index 1b1f1a241173..f9bf5ecf4ab5 100644
--- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix
+++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix
@@ -29,10 +29,7 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gnome-backgrounds";
-      attrPath = "gnome.gnome-backgrounds";
-    };
+    updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/stable-dir.patch b/pkgs/by-name/gn/gnome-backgrounds/stable-dir.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-backgrounds/stable-dir.patch
rename to pkgs/by-name/gn/gnome-backgrounds/stable-dir.patch
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 57ef762df9ea..ae530b3e6c04 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -24,8 +24,6 @@ in
 
   gdm = callPackage ./core/gdm { };
 
-  gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
-
   gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
 
   gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { };
@@ -162,6 +160,7 @@ in
   ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22.
   gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22.
   gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13.
+  gnome-backgrounds = lib.warn "The ‘gnome.gnome-backgrounds’ was moved to top-level. Please use ‘pkgs.gnome-backgrounds’ directly." pkgs.gnome-backgrounds; # Added on 2024-08-11.
   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.