diff --git a/pkgs/by-name/gn/gnome-settings-daemon46/add-gnome-session-ctl-option.patch b/pkgs/by-name/gn/gnome-settings-daemon48/add-gnome-session-ctl-option.patch similarity index 100% rename from pkgs/by-name/gn/gnome-settings-daemon46/add-gnome-session-ctl-option.patch rename to pkgs/by-name/gn/gnome-settings-daemon48/add-gnome-session-ctl-option.patch diff --git a/pkgs/by-name/gn/gnome-settings-daemon46/fix-paths.patch b/pkgs/by-name/gn/gnome-settings-daemon48/fix-paths.patch similarity index 100% rename from pkgs/by-name/gn/gnome-settings-daemon46/fix-paths.patch rename to pkgs/by-name/gn/gnome-settings-daemon48/fix-paths.patch diff --git a/pkgs/by-name/gn/gnome-settings-daemon46/package.nix b/pkgs/by-name/gn/gnome-settings-daemon48/package.nix similarity index 81% rename from pkgs/by-name/gn/gnome-settings-daemon46/package.nix rename to pkgs/by-name/gn/gnome-settings-daemon48/package.nix index 550c7c6d1023..02c1d8ee6940 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon46/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon48/package.nix @@ -2,6 +2,7 @@ stdenv, lib, replaceVars, + buildPackages, fetchurl, meson, ninja, @@ -36,15 +37,17 @@ tzdata, gcr_4, gnome-session-ctl, + udevCheckHook, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-settings-daemon"; - version = "46.0"; + version = "48.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz"; - hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c="; + hash = "sha256-OGCi6iFNy8tmAK56HjNYpTiSFQh7w+SkfO4/h7ruBi4="; }; patches = [ @@ -56,17 +59,24 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + depsBuildBuild = [ + buildPackages.stdenv.cc + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config perl gettext + glib libxml2 libxslt docbook_xsl wrapGAppsHook3 python3 + udevCheckHook ]; buildInputs = [ @@ -87,14 +97,19 @@ stdenv.mkDerivation (finalAttrs: { polkit geocode-glib_2 geoclue2 - systemd libgudev libwacom gcr_4 + ] + ++ lib.optionals withSystemd [ + systemd ]; mesonFlags = [ "-Dudev_dir=${placeholder "out"}/lib/udev" + (lib.mesonBool "systemd" withSystemd) + ] + ++ lib.optionals withSystemd [ "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" ]; @@ -103,12 +118,14 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; postPatch = '' - for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do + for f in plugins/power/gsd-power-constants-update.pl; do chmod +x $f patchShebangs $f done ''; + doInstallCheck = true; + meta = { description = "GNOME Settings Daemon"; homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index ce88d24e09d1..aa243007a710 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -47,8 +47,8 @@ lib.makeScope pkgs.newScope ( mutter = pkgs.mutter48; - # Using 43 to match Mutter used in Pantheon - gnome-settings-daemon = pkgs.gnome-settings-daemon46; + # Using 48 to match Mutter used in Pantheon + gnome-settings-daemon = pkgs.gnome-settings-daemon48; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1f1ae3d2d466..7189c4978b2e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -778,6 +778,7 @@ mapAliases { gnome-passwordsafe = throw "'gnome-passwordsafe' has been renamed to/replaced by 'gnome-secrets'"; # Converted to throw 2025-10-27 gnome-recipes = throw "'gnome-recipes' has been removed due to lack of upstream maintenance and dependency on insecure libraries"; # Added 2025-09-06 gnome-resources = throw "'gnome-resources' has been renamed to/replaced by 'resources'"; # Converted to throw 2025-10-27 + gnome-settings-daemon46 = throw "'gnome-settings-daemon46' has been removed, no longer used by Pantheon"; # Added 2026-01-24 gns3Packages = throw "'gns3Packages' has been removed. Use 'gns3-gui' and 'gns3-server' instead."; # Added 2026-01-18 gnu-cobol = throw "'gnu-cobol' has been renamed to/replaced by 'gnucobol'"; # Converted to throw 2025-10-27 gnubik = throw "'gnubik' has been removed due to lack of maintenance upstream and its dependency on GTK 2"; # Added 2025-09-16