cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #164266 from bobby285271/meson061

Browse source 
gnome.gnome-settings-daemon338: fix build with meson 0.61
This commit is contained in:
Bobby Rong 2022-03-17 20:11:25 +08:00 committed by GitHub
commit 0bc3400b38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix
View file

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