diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-03-17 20:11:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-17 20:11:25 +0800 |
| commit | 0bc3400b38a355e560dcdea2da21f26f6ddf3bbd (patch) | |
| tree | 97fa21710d3616ec8e2ad2551c597e5d6d751b9d /pkgs | |
| parent | 5855ff74f511423e3e2646248598b3ffff229223 (diff) | |
| parent | 4a71acf24e1987af18e83c8a5ac8c55db60d1b18 (diff) | |
Merge pull request #164266 from bobby285271/meson061
gnome.gnome-settings-daemon338: fix build with meson 0.61
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix index aae01577a8817..b043883a492c3 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchpatch , substituteAll , fetchurl @@ -70,6 +71,14 @@ stdenv.mkDerivation rec { }) # 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="; |