diff options
20 files changed, 32 insertions, 28 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix index 1de5ba113875a..81d59f55db7cc 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix @@ -25,7 +25,7 @@ sleep-inactive-battery-type='nothing' ''; - extraGSettingsOverridePackages = [ pkgs.gnome.gnome-settings-daemon ]; + extraGSettingsOverridePackages = [ pkgs.gnome-settings-daemon ]; enable = true; }; diff --git a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix index 30b35f6690921..21e7c3b587134 100644 --- a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix +++ b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix @@ -32,15 +32,15 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ - pkgs.gnome.gnome-settings-daemon + pkgs.gnome-settings-daemon ]; services.udev.packages = [ - pkgs.gnome.gnome-settings-daemon + pkgs.gnome-settings-daemon ]; systemd.packages = [ - pkgs.gnome.gnome-settings-daemon + pkgs.gnome-settings-daemon ]; systemd.user.targets."gnome-session-x11-services".wants = [ diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 69c3fdbfbca0c..1c82fa7d8612e 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,7 +1,7 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook3, gnome }: +, gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gst-plugins-ugly gstreamer - gnome.gnome-settings-daemon + gnome-settings-daemon gtk3 gtkspell3 hunspell diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix index 0914bec39610a..0ee7f52286249 100644 --- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix @@ -7,7 +7,7 @@ cmake, dbus, glib, - gnome, + gnome-settings-daemon, gsettings-desktop-schemas, gtest, intltool, @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { # TODO these bloat the closure size alot, just so the indicator doesn't have the potential to crash. # is there a better way to give it access to DE-specific schemas as needed? # https://github.com/AyatanaIndicators/ayatana-indicator-session/blob/88846bad7ee0aa8e0bb122816d06f9bc887eb464/src/service.c#L1387-L1413 - gnome.gnome-settings-daemon + gnome-settings-daemon mate.mate-settings-daemon ]; diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index 702c48d5bf707..931c26ff8d6c8 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -25,6 +25,7 @@ gnome-color-manager, gnome-desktop, gnome-remote-desktop, + gnome-settings-daemon, gnome-user-share, gsettings-desktop-schemas, gsound, @@ -119,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { cheese gnome-bluetooth_1_0 gnome-remote-desktop - gnome.gnome-settings-daemon + gnome-settings-daemon gnome-user-share gnome.mutter gsettings-desktop-schemas diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index e75704944f7ab..f6452953e8354 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -9,6 +9,7 @@ glib, gnome, gnome-desktop, + gnome-settings-daemon, graphene, gst_all_1, gtk-doc, @@ -79,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { budgie-screensaver glib gnome-desktop - gnome.gnome-settings-daemon + gnome-settings-daemon gnome.mutter zenity graphene diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix index 0dfd4dc608245..407902d824e70 100644 --- a/pkgs/by-name/bu/budgie-session/package.nix +++ b/pkgs/by-name/bu/budgie-session/package.nix @@ -6,12 +6,12 @@ meson, ninja, pkg-config, - gnome, adwaita-icon-theme, glib, gtk3, gsettings-desktop-schemas, gnome-desktop, + gnome-settings-daemon, dbus, json-glib, libICE, @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { json-glib xorg.xtrans adwaita-icon-theme - gnome.gnome-settings-daemon + gnome-settings-daemon gsettings-desktop-schemas systemd libepoxy @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram "$out/libexec/budgie-session-binary" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" + --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg" ''; separateDebugInfo = true; diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index dd65e5727623d..f93a877bc0188 100644 --- a/pkgs/by-name/gn/gnome-disk-utility/package.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -15,6 +15,7 @@ , libnotify , itstool , gnome +, gnome-settings-daemon , adwaita-icon-theme , libxml2 , gsettings-desktop-schemas @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { udisks2 adwaita-icon-theme systemd - gnome.gnome-settings-daemon + gnome-settings-daemon gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix b/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix index ff0fbbffb0667..ff0fbbffb0667 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch b/pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch index 2229302cab7c0..2229302cab7c0 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch +++ b/pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/add-gnome-session-ctl-option.patch b/pkgs/by-name/gn/gnome-settings-daemon/add-gnome-session-ctl-option.patch index 8bdf39ce37b62..8bdf39ce37b62 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/add-gnome-session-ctl-option.patch +++ b/pkgs/by-name/gn/gnome-settings-daemon/add-gnome-session-ctl-option.patch diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch b/pkgs/by-name/gn/gnome-settings-daemon/fix-paths.patch index 2229302cab7c0..2229302cab7c0 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch +++ b/pkgs/by-name/gn/gnome-settings-daemon/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix index f5b1f89805d48..8f9b06f0dfda6 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -114,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "gnome-settings-daemon"; - attrPath = "gnome.gnome-settings-daemon"; }; }; diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix index 0e3e44f345d55..57660f06badc2 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-settings-daemon , gnome-shell-extensions , gobject-introspection , gsettings-desktop-schemas @@ -48,7 +49,7 @@ python3Packages.buildPythonApplication rec { gdk-pixbuf glib gnome-desktop - gnome.gnome-settings-daemon + gnome-settings-daemon gnome.gnome-shell # Makes it possible to select user themes through the `user-theme` extension gnome-shell-extensions diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix index 176c81fae2b80..d549a46148d97 100644 --- a/pkgs/by-name/ma/magpie/package.nix +++ b/pkgs/by-name/ma/magpie/package.nix @@ -5,7 +5,7 @@ fetchpatch, stdenv, pkg-config, - gnome, + gnome-settings-daemon, gettext, gobject-introspection, cairo, @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { cairo glib gnome-desktop - gnome.gnome-settings-daemon + gnome-settings-daemon gobject-introspection gsettings-desktop-schemas gtk3 diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index 74eb9dbd09ec0..78824870ac0ca 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -12,6 +12,7 @@ gtk3, gsettings-desktop-schemas, gnome-desktop, + gnome-settings-daemon, dbus, json-glib, libICE, @@ -75,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { json-glib xorg.xtrans adwaita-icon-theme - gnome.gnome-settings-daemon + gnome-settings-daemon gsettings-desktop-schemas systemd libepoxy @@ -114,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share" \ - --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" + --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg" ''; separateDebugInfo = true; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 6c435e76ed95f..401d6bbdd73c9 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -23,11 +23,6 @@ in gnome-shell = callPackage ./core/gnome-shell { }; - gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; - - # Using 43 to match Mutter used in Pantheon - gnome-settings-daemon43 = callPackage ./core/gnome-settings-daemon/43 { }; - gvfs = pkgs.gvfs.override { gnomeSupport = true; }; mutter = callPackage ./core/mutter { }; @@ -134,6 +129,8 @@ in 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-session-ctl = lib.warn "The ‘gnome.gnome-session-ctl’ was moved to top-level. Please use ‘pkgs.gnome-session-ctl’ directly." pkgs.gnome-session-ctl; # Added on 2024-08-28. + gnome-settings-daemon = lib.warn "The ‘gnome.gnome-settings-daemon’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon’ directly." pkgs.gnome-settings-daemon; # Added on 2024-08-28. + gnome-settings-daemon43 = lib.warn "The ‘gnome.gnome-settings-daemon43’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon43’ directly." pkgs.gnome-settings-daemon43; # Added on 2024-08-28. 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. diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 47f4d036fc5cb..d0febb9513e93 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -41,7 +41,7 @@ lib.makeScope pkgs.newScope (self: with self; { mutter = pkgs.gnome.mutter43; # Using 43 to match Mutter used in Pantheon - gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon43; + gnome-settings-daemon = pkgs.gnome-settings-daemon43; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index e1a51284927a3..a1d01682f22e9 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -6,7 +6,7 @@ , pkg-config , xdg-desktop-portal , gtk3 -, gnome +, gnome-settings-daemon , gnome-desktop , glib , wrapGAppsHook3 @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals buildPortalsInGnome [ gsettings-desktop-schemas # settings exposed by settings portal gnome-desktop - gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings) + gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings) ]; mesonFlags = lib.optionals (!buildPortalsInGnome) [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3879536cb9549..c392ecef985d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36513,6 +36513,9 @@ with pkgs; gnome-session-ctl = callPackage ../desktops/gnome/core/gnome-session/ctl.nix { }; + # Using 43 to match Mutter used in Pantheon + gnome-settings-daemon43 = callPackage ../by-name/gn/gnome-settings-daemon/43 { }; + gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { }); lomiri = recurseIntoAttrs (callPackage ../desktops/lomiri { }); |