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

---
 .../services/desktops/gnome/gnome-remote-desktop.nix      | 8 ++++----
 pkgs/by-name/bu/budgie-control-center/package.nix         | 3 ++-
 .../gn/gnome-remote-desktop/package.nix}                  | 5 +----
 pkgs/desktops/gnome/default.nix                           | 3 +--
 4 files changed, 8 insertions(+), 11 deletions(-)
 rename pkgs/{desktops/gnome/core/gnome-remote-desktop/default.nix => by-name/gn/gnome-remote-desktop/package.nix} (92%)

diff --git a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
index d81a9edfa126..8ffb4a201e36 100644
--- a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
@@ -16,12 +16,12 @@
   ###### implementation
   config = lib.mkIf config.services.gnome.gnome-remote-desktop.enable {
     services.pipewire.enable = true;
-    services.dbus.packages = [ pkgs.gnome.gnome-remote-desktop ];
+    services.dbus.packages = [ pkgs.gnome-remote-desktop ];
 
-    environment.systemPackages = [ pkgs.gnome.gnome-remote-desktop ];
+    environment.systemPackages = [ pkgs.gnome-remote-desktop ];
 
-    systemd.packages = [ pkgs.gnome.gnome-remote-desktop ];
-    systemd.tmpfiles.packages = [ pkgs.gnome.gnome-remote-desktop ];
+    systemd.packages = [ pkgs.gnome-remote-desktop ];
+    systemd.tmpfiles.packages = [ pkgs.gnome-remote-desktop ];
 
     # TODO: if possible, switch to using provided g-r-d sysusers.d
     users = {
diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
index 418a4d5493f1..3efe7787db6f 100644
--- a/pkgs/by-name/bu/budgie-control-center/package.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -23,6 +23,7 @@
   gnome,
   gnome-color-manager,
   gnome-desktop,
+  gnome-remote-desktop,
   gnome-user-share,
   gsettings-desktop-schemas,
   gsound,
@@ -116,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
     adwaita-icon-theme
     cheese
     gnome.gnome-bluetooth_1_0
-    gnome.gnome-remote-desktop
+    gnome-remote-desktop
     gnome.gnome-settings-daemon
     gnome-user-share
     gnome.mutter
diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
similarity index 92%
rename from pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix
rename to pkgs/by-name/gn/gnome-remote-desktop/package.nix
index 2d80375c167f..31896fef41b0 100644
--- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix
+++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
@@ -80,10 +80,7 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gnome-remote-desktop";
-      attrPath = "gnome.gnome-remote-desktop";
-    };
+    updateScript = gnome.updateScript { packageName = "gnome-remote-desktop"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index fdbd7b8e796f..5f31400cd219 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -32,8 +32,6 @@ in
 
   gnome-initial-setup = callPackage ./core/gnome-initial-setup { };
 
-  gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { };
-
   gnome-session = callPackage ./core/gnome-session { };
 
   gnome-session-ctl = callPackage ./core/gnome-session/ctl.nix { };
@@ -176,6 +174,7 @@ in
   gnome-notes = lib.warn "The ‘gnome.gnome-notes’ was moved to top-level. Please use ‘pkgs.gnome-notes’ directly." pkgs.gnome-notes; # Added on 2024-08-11.
   gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22.
   gnome-power-manager = lib.warn "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly." pkgs.gnome-power-manager; # Added on 2024-08-11.
+  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-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-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.