From 64438363f5c45363759b6c298249643aedbca5bf Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Aug 2024 18:48:19 +0200
Subject: [PATCH] gnome-shell-extensions: Move from gnome scope to top-level

---
 nixos/modules/services/x11/desktop-managers/gnome.nix        | 4 ++--
 .../gn}/gnome-shell-extensions/fix_gmenu.patch               | 0
 .../gn}/gnome-shell-extensions/fix_gtop.patch                | 0
 .../gn/gnome-shell-extensions/package.nix}                   | 5 +----
 pkgs/by-name/gn/gnome-tweaks/package.nix                     | 3 ++-
 pkgs/desktops/gnome/default.nix                              | 3 +--
 6 files changed, 6 insertions(+), 9 deletions(-)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-shell-extensions/fix_gmenu.patch (100%)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-shell-extensions/fix_gtop.patch (100%)
 rename pkgs/{desktops/gnome/core/gnome-shell-extensions/default.nix => by-name/gn/gnome-shell-extensions/package.nix} (92%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 043c7e1fdfbc..49c94760780e 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -312,7 +312,7 @@ in
             pkgs.gnome.gnome-shell
           ];
           optionalPackages = [
-            pkgs.gnome.gnome-shell-extensions
+            pkgs.gnome-shell-extensions
           ];
         in
         mandatoryPackages
@@ -378,7 +378,7 @@ in
             gnome-bluetooth
             pkgs.gnome-color-manager
             gnome-control-center
-            gnome-shell-extensions
+            pkgs.gnome-shell-extensions
             pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
             pkgs.gnome-user-docs
             pkgs.orca
diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch b/pkgs/by-name/gn/gnome-shell-extensions/fix_gmenu.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch
rename to pkgs/by-name/gn/gnome-shell-extensions/fix_gmenu.patch
diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gtop.patch b/pkgs/by-name/gn/gnome-shell-extensions/fix_gtop.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gtop.patch
rename to pkgs/by-name/gn/gnome-shell-extensions/fix_gtop.patch
diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix
similarity index 92%
rename from pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
rename to pkgs/by-name/gn/gnome-shell-extensions/package.nix
index cb5feb26e408..dbcf91b5bc49 100644
--- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
+++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix
@@ -66,10 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gnome-shell-extensions";
-      attrPath = "gnome.gnome-shell-extensions";
-    };
+    updateScript = gnome.updateScript { packageName = "gnome-shell-extensions"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix
index 3bbe91007b6d..0e3e44f345d5 100644
--- a/pkgs/by-name/gn/gnome-tweaks/package.nix
+++ b/pkgs/by-name/gn/gnome-tweaks/package.nix
@@ -8,6 +8,7 @@
 , glib
 , gnome
 , gnome-desktop
+, gnome-shell-extensions
 , gobject-introspection
 , gsettings-desktop-schemas
 , gtk4
@@ -50,7 +51,7 @@ python3Packages.buildPythonApplication rec {
     gnome.gnome-settings-daemon
     gnome.gnome-shell
     # Makes it possible to select user themes through the `user-theme` extension
-    gnome.gnome-shell-extensions
+    gnome-shell-extensions
     gnome.mutter
     gsettings-desktop-schemas
     gtk4
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index b0c36527ca80..a1aad906e97c 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -34,8 +34,6 @@ in
 
   gnome-shell = callPackage ./core/gnome-shell { };
 
-  gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
-
   gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { };
 
   # Using 43 to match Mutter used in Pantheon
@@ -144,6 +142,7 @@ in
   gnome-remote-desktop = lib.warn "The ‘gnome.gnome-remote-desktop’ was moved to top-level. Please use ‘pkgs.gnome-remote-desktop’ directly." pkgs.gnome-remote-desktop; # Added on 2024-08-11.
   gnome-robots = lib.warn "The ‘gnome.gnome-robots’ was moved to top-level. Please use ‘pkgs.gnome-robots’ directly." pkgs.gnome-robots; # Added on 2024-08-11.
   gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22.
+  gnome-shell-extensions = lib.warn "The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly." pkgs.gnome-shell-extensions; # Added on 2024-08-11.
   gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11.
   gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11.
   gnome-sudoku = lib.warn "The ‘gnome.gnome-sudoku’ was moved to top-level. Please use ‘pkgs.gnome-sudoku’ directly." pkgs.gnome-sudoku; # Added on 2024-08-11.