qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome-settings-daemon{,43}: Move from gnome scope to top-level

Browse Source
This commit is contained in:
Jan Tojnar 2024-08-28 23:41:06 +02:00
parent 649d663029
commit d2da9a19c4
20 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix
View File

@ -25,7 +25,7 @@
sleep-inactive-battery-type='nothing'
'';
extraGSettingsOverridePackages = [ pkgs.gnome.gnome-settings-daemon ];
extraGSettingsOverridePackages = [ pkgs.gnome-settings-daemon ];
enable = true;
};

6
nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
View File

@ -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 = [

4
pkgs/applications/networking/browsers/eolie/default.nix
View File

@ -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

4
pkgs/by-name/ay/ayatana-indicator-session/package.nix
View File

@ -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
];

3
pkgs/by-name/bu/budgie-control-center/package.nix
View File

@ -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

3
pkgs/by-name/bu/budgie-desktop/package.nix
View File

@ -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

6
pkgs/by-name/bu/budgie-session/package.nix
View File

@ -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;

3
pkgs/by-name/gn/gnome-disk-utility/package.nix
View File

@ -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
];

0
pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix → pkgs/by-name/gn/gnome-settings-daemon/43/default.nix
View File

0
pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch → pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch
View File

0
pkgs/desktops/gnome/core/gnome-settings-daemon/add-gnome-session-ctl-option.patch → pkgs/by-name/gn/gnome-settings-daemon/add-gnome-session-ctl-option.patch
View File

0
pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch → pkgs/by-name/gn/gnome-settings-daemon/fix-paths.patch
View File

1
pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix → pkgs/by-name/gn/gnome-settings-daemon/package.nix
View File

@ -114,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-settings-daemon";
attrPath = "gnome.gnome-settings-daemon";
};
};

3
pkgs/by-name/gn/gnome-tweaks/package.nix
View File

@ -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

4
pkgs/by-name/ma/magpie/package.nix
View File

@ -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

5
pkgs/desktops/gnome/core/gnome-session/default.nix
View File

@ -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;

7
pkgs/desktops/gnome/default.nix
View File

@ -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.

2
pkgs/desktops/pantheon/default.nix
View File

@ -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 { };

4
pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
View File

@ -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) [

3
pkgs/top-level/all-packages.nix
View File

@ -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 { });