From 4601539c51443c549c7d7881e4669c7fd9ee931d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Mar 2023 23:53:44 +0800 Subject: pantheon.gnome-settings-daemon: 42.2 -> 43.0 https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/42.2...43.0 --- .../core/gnome-settings-daemon/42/default.nix | 135 --------------------- .../core/gnome-settings-daemon/42/fix-paths.patch | 15 --- .../core/gnome-settings-daemon/43/default.nix | 128 +++++++++++++++++++ .../core/gnome-settings-daemon/43/fix-paths.patch | 15 +++ .../global-backlight-helper.patch | 26 ---- pkgs/desktops/gnome/default.nix | 5 +- pkgs/desktops/pantheon/default.nix | 4 +- 7 files changed, 148 insertions(+), 180 deletions(-) delete mode 100644 pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix delete mode 100644 pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch create mode 100644 pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix create mode 100644 pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch delete mode 100644 pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix deleted file mode 100644 index e05040cc6e4cf..0000000000000 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ stdenv -, lib -, fetchpatch -, substituteAll -, fetchurl -, meson -, ninja -, pkg-config -, gnome -, perl -, gettext -, gtk3 -, glib -, libnotify -, libgnomekbd -, lcms2 -, libpulseaudio -, alsa-lib -, libcanberra-gtk3 -, upower -, colord -, libgweather -, polkit -, gsettings-desktop-schemas -, geoclue2 -, systemd -, libgudev -, libwacom -, libxslt -, libxml2 -, modemmanager -, networkmanager -, gnome-desktop -, geocode-glib_2 -, docbook_xsl -, wrapGAppsHook -, python3 -, tzdata -, nss -, gcr -, gnome-session-ctl -}: - -stdenv.mkDerivation rec { - pname = "gnome-settings-daemon"; - version = "42.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA="; - }; - - patches = [ - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/aae1e774dd9de22fe3520cf9eb2bfbf7216f5eb0.patch"; - sha256 = "O4m0rOW8Zrgu3Q0p0OA8b951VC0FjYbOUk9MLzB9icI="; - }) - - (substituteAll { - src = ./fix-paths.patch; - inherit tzdata; - }) - - # Use geocode-glib_2 dependency - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/03739474621e579e10b72577960ff94b4001e7ff.patch"; - sha256 = "W4uD4ChNPZSsmQfmfmmXFA2Sm1RDkV7MqG8DmT4qeCY="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - perl - gettext - libxml2 - libxslt - docbook_xsl - wrapGAppsHook - python3 - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - modemmanager - networkmanager - libnotify - libgnomekbd # for org.gnome.libgnomekbd.keyboard schema - gnome-desktop - lcms2 - libpulseaudio - alsa-lib - libcanberra-gtk3 - upower - colord - libgweather - nss - polkit - geocode-glib_2 - geoclue2 - systemd - libgudev - libwacom - gcr - ]; - - mesonFlags = [ - "-Dudev_dir=${placeholder "out"}/lib/udev" - "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" - ]; - - # Default for release buildtype but passed manually because - # we're using plain - env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; - - postPatch = '' - for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do - chmod +x $f - patchShebangs $f - done - ''; - - meta = with lib; { - description = "GNOME Settings Daemon"; - homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"; - license = licenses.gpl2Plus; - maintainers = teams.pantheon.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch deleted file mode 100644 index 2229302cab7c0..0000000000000 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/plugins/datetime/tz.h -+++ b/plugins/datetime/tz.h -@@ -27,11 +27,7 @@ - - #include - --#ifndef __sun --# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" --#else --# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" --#endif -+#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" - - typedef struct _TzDB TzDB; - typedef struct _TzLocation TzLocation; diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix new file mode 100644 index 0000000000000..95eb6fe1d25e1 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix @@ -0,0 +1,128 @@ +{ stdenv +, lib +, fetchpatch +, substituteAll +, fetchurl +, meson +, ninja +, pkg-config +, gnome +, perl +, gettext +, gtk3 +, glib +, libnotify +, libgnomekbd +, lcms2 +, libpulseaudio +, alsa-lib +, libcanberra-gtk3 +, upower +, colord +, libgweather +, polkit +, gsettings-desktop-schemas +, geoclue2 +, systemd +, libgudev +, libwacom +, libxslt +, libxml2 +, modemmanager +, networkmanager +, gnome-desktop +, geocode-glib_2 +, docbook_xsl +, wrapGAppsHook +, python3 +, tzdata +, nss +, gcr_4 +, gnome-session-ctl +}: + +stdenv.mkDerivation rec { + pname = "gnome-settings-daemon"; + version = "43.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "NRO7JPxvgYFmciOmSgZ1NP3M879mMmqUA9OLDw1gE9A="; + }; + + patches = [ + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/aae1e774dd9de22fe3520cf9eb2bfbf7216f5eb0.patch"; + sha256 = "O4m0rOW8Zrgu3Q0p0OA8b951VC0FjYbOUk9MLzB9icI="; + }) + + (substituteAll { + src = ./fix-paths.patch; + inherit tzdata; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + perl + gettext + libxml2 + libxslt + docbook_xsl + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + modemmanager + networkmanager + libnotify + libgnomekbd # for org.gnome.libgnomekbd.keyboard schema + gnome-desktop + lcms2 + libpulseaudio + alsa-lib + libcanberra-gtk3 + upower + colord + libgweather + nss + polkit + geocode-glib_2 + geoclue2 + systemd + libgudev + libwacom + gcr_4 + ]; + + mesonFlags = [ + "-Dudev_dir=${placeholder "out"}/lib/udev" + "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" + ]; + + # Default for release buildtype but passed manually because + # we're using plain + 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 + chmod +x $f + patchShebangs $f + done + ''; + + meta = with lib; { + description = "GNOME Settings Daemon"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"; + license = licenses.gpl2Plus; + maintainers = teams.pantheon.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch new file mode 100644 index 0000000000000..2229302cab7c0 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch @@ -0,0 +1,15 @@ +--- a/plugins/datetime/tz.h ++++ b/plugins/datetime/tz.h +@@ -27,11 +27,7 @@ + + #include + +-#ifndef __sun +-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" +-#else +-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" +-#endif ++#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" + + typedef struct _TzDB TzDB; + typedef struct _TzLocation TzLocation; diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch deleted file mode 100644 index 8f3951af2da85..0000000000000 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c -index d7d10fd2..5619d6ad 100644 ---- a/plugins/power/gsd-backlight.c -+++ b/plugins/power/gsd-backlight.c -@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task) - proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, - &error, - "pkexec", -- LIBEXECDIR "/gsd-backlight-helper", -+ "/run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper", - g_udev_device_get_sysfs_path (backlight->udev_device), - data->value_str, NULL); - } else { -diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -index f16300f8..79d6bd17 100644 ---- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -+++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -@@ -25,7 +25,7 @@ - no - yes - -- @libexecdir@/gsd-backlight-helper -+ /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper - - - diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index cfd47ddda45c0..62af89161e7f6 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -75,8 +75,8 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; - # Using 42 to match Mutter used in Pantheon - gnome-settings-daemon42 = callPackage ./core/gnome-settings-daemon/42 { }; + # Using 43 to match Mutter used in Pantheon + gnome-settings-daemon43 = callPackage ./core/gnome-settings-daemon/43 { }; gnome-software = callPackage ./core/gnome-software { }; @@ -274,4 +274,5 @@ lib.makeScope pkgs.newScope (self: with self; { mutter338 = throw "The ‘gnome.mutter338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 mutter42 = throw "The ‘gnome.mutter42’ package was removed as it is no longer needed by Pantheon."; # added 2023-03-23 gnome-settings-daemon338 = throw "The ‘gnome.gnome-settings-daemon338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 + gnome-settings-daemon42 = throw "The ‘gnome.gnome-settings-daemon42’ package was removed as it is no longer needed by Pantheon."; # added 2023-03-23 } diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index b5ce60985bd79..9ba16c2eb765d 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -42,8 +42,8 @@ lib.makeScope pkgs.newScope (self: with self; { mutter = pkgs.gnome.mutter43; - # Using 42 to match Mutter used in Pantheon - gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon42; + # Using 43 to match Mutter used in Pantheon + gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon43; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; -- cgit 1.4.1