From 453e89fd196615bdc2c928e882fafe5e2578f552 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 22 Jun 2024 16:30:52 +0200
Subject: [PATCH] cheese: Move from gnome scope to top-level

---
 .../apps/cheese/default.nix => by-name/ch/cheese/package.nix}  | 1 -
 pkgs/desktops/budgie/budgie-control-center/default.nix         | 3 ++-
 pkgs/desktops/gnome/default.nix                                | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename pkgs/{desktops/gnome/apps/cheese/default.nix => by-name/ch/cheese/package.nix} (98%)

diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/by-name/ch/cheese/package.nix
similarity index 98%
rename from pkgs/desktops/gnome/apps/cheese/default.nix
rename to pkgs/by-name/ch/cheese/package.nix
index 9dd578438c50..83381d2abae8 100644
--- a/pkgs/desktops/gnome/apps/cheese/default.nix
+++ b/pkgs/by-name/ch/cheese/package.nix
@@ -93,7 +93,6 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "cheese";
-      attrPath = "gnome.cheese";
     };
   };
 
diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix
index 8650289f085e..015b8ca97083 100644
--- a/pkgs/desktops/budgie/budgie-control-center/default.nix
+++ b/pkgs/desktops/budgie/budgie-control-center/default.nix
@@ -5,6 +5,7 @@
 , accountsservice
 , adwaita-icon-theme
 , budgie-desktop
+, cheese
 , clutter
 , clutter-gtk
 , colord
@@ -104,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib-networking
     gnome-desktop
     adwaita-icon-theme
-    gnome.cheese
+    cheese
     gnome.gnome-bluetooth_1_0
     gnome.gnome-remote-desktop
     gnome.gnome-settings-daemon
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 591453019eed..0d54468277d5 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -98,8 +98,6 @@ in
 
 #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
 
-  cheese = callPackage ./apps/cheese { };
-
   gnome-boxes = callPackage ./apps/gnome-boxes { };
 
   gnome-characters = callPackage ./apps/gnome-characters { };
@@ -189,6 +187,7 @@ in
   accerciser = lib.warn "The ‘gnome.accerciser’ was moved to top-level. Please use ‘pkgs.accerciser’ directly." pkgs.accerciser; # Added on 2024-06-22.
   adwaita-icon-theme = lib.warn "The ‘gnome.adwaita-icon-theme’ was moved to top-level. Please use ‘pkgs.adwaita-icon-theme’ directly." pkgs.adwaita-icon-theme; # Added on 2024-06-22.
   baobab = lib.warn "The ‘gnome.baobab’ was moved to top-level. Please use ‘pkgs.baobab’ directly." pkgs.baobab; # Added on 2024-06-22.
+  cheese = lib.warn "The ‘gnome.cheese’ was moved to top-level. Please use ‘pkgs.cheese’ directly." pkgs.cheese; # Added on 2024-06-22.
   dconf-editor = lib.warn "The ‘gnome.dconf-editor’ was moved to top-level. Please use ‘pkgs.dconf-editor’ directly." pkgs.dconf-editor; # Added on 2024-06-22.
   devhelp = lib.warn "The ‘gnome.devhelp’ was moved to top-level. Please use ‘pkgs.devhelp’ directly." pkgs.devhelp; # Added on 2024-06-22.
   eog = lib.warn "The ‘gnome.eog’ was moved to top-level. Please use ‘pkgs.eog’ directly." pkgs.eog; # Added on 2024-06-22.