BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pantheon.gnome-settings-daemon: 3.38.2 -> 42.2

Browse source 
https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/GNOME_SETTINGS_DAEMON_3_38_2...42.2
This commit is contained in:
Bobby Rong 2022-09-09 21:19:39 +08:00
parent cae5a65c90
commit 3a97d63d5c
No known key found for this signature in database
4 changed files with 8 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix → pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix
View file

@ -39,16 +39,15 @@
, nss , nss
, gcr , gcr
, gnome-session-ctl , gnome-session-ctl
, pantheon
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-settings-daemon"; pname = "gnome-settings-daemon";
version = "3.38.2"; version = "42.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "136p3prdqvc0lvrcqs4h7crpnfqnimqklpzjivq5w4g1rhbdbhrj"; sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA=";
}; };
patches = [ patches = [
@ -63,37 +62,6 @@ stdenv.mkDerivation rec {
inherit tzdata; inherit tzdata;
}) })
# Adjust to libgweather changes.
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/217
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/82d88014dfca2df7e081712870e1fb017c16b808.patch";
sha256 = "H5k/v+M2bRaswt5nrDJFNn4gS4BdB0UfzdjUCT4yLKg=";
})
# Fix build with new meson
# plugins/power/meson.build:78:7: ERROR: Function does not take positional arguments.
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch";
sha256 = "8wxJIKPoZyfs1t0zAsb5SVCdt297NUiGmXIBNI6hbCQ=";
})
# meson.build:86:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/249
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff";
sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY=";
})
# Port to gweather4
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/66cae69ad82cfc59435016fba737ce046ffb7e66.patch";
sha256 = "zf8/rkKdQQFNV/qx/jo4kx1KoLl7SUSu4/T1OBGrZ4c=";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/f390e6e9d56ce7d3e3a725b8204d81c0b6240515.patch";
sha256 = "8mfnlhkSF9ogjVWE+IESzRQzrxHQSwUWsq5OLBM08iM=";
})
# Use geocode-glib_2 dependency # Use geocode-glib_2 dependency
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300 # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300
(fetchpatch { (fetchpatch {

0
pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/fix-paths.patch → pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch
View file

5
pkgs/desktops/gnome/default.nix
View file

@ -75,8 +75,8 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { };
# Using 3.38 to match Mutter used in Pantheon # Using 42 to match Mutter used in Pantheon
gnome-settings-daemon338 = callPackage ./core/gnome-settings-daemon/3.38 { }; gnome-settings-daemon42 = callPackage ./core/gnome-settings-daemon/42 { };
gnome-software = callPackage ./core/gnome-software { }; gnome-software = callPackage ./core/gnome-software { };
@ -272,4 +272,5 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-devel-docs = throw "The ‘gnome.gnome-devel-docs’ package was removed as it is outdated and no longer relevant."; # added 2022-10-26 gnome-devel-docs = throw "The ‘gnome.gnome-devel-docs’ package was removed as it is outdated and no longer relevant."; # added 2022-10-26
mutter338 = throw "The ‘gnome.mutter338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 mutter338 = throw "The ‘gnome.mutter338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22
gnome-settings-daemon338 = throw "The ‘gnome.gnome-settings-daemon338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22
} }

4
pkgs/desktops/pantheon/default.nix
View file

@ -42,8 +42,8 @@ lib.makeScope pkgs.newScope (self: with self; {
mutter = pkgs.gnome.mutter42; mutter = pkgs.gnome.mutter42;
# Using 3.38 to match Mutter used in Pantheon # Using 42 to match Mutter used in Pantheon
gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon338; gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon42;
elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };