diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-03-20 08:40:42 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-03-20 14:40:18 +0000 |
| commit | 89ed2ce3e8e21d3cb70edde3ce726a747e26b3e0 (patch) | |
| tree | 136d5ce77941aa5c5f3de3be1bff8269d643171f | |
| parent | 6a300e5a27c4cf57b4e322fa6bf7dbf885f52632 (diff) | |
gcr: pull upstream fix for meson-0.60
Without the change build fails on `staging` as:
> gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
| -rw-r--r-- | pkgs/development/libraries/gcr/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 9c97faaa45cbc..b277a52a65837 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , pkg-config , meson , ninja @@ -34,6 +35,16 @@ stdenv.mkDerivation rec { sha256 = "CQn8SeqK1IMtJ1ZP8v0dxmZpbioHxzlBxIgp5gVy2gE="; }; + patches = [ + # Pull upstream fix for meson-0.60: + # https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81 + (fetchpatch { + name = "meson-0.60.patch"; + url = "https://gitlab.gnome.org/GNOME/gcr/-/commit/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"; + sha256 = "15gwxkcm5q5p87p5lrqwgykpzx5gmk179xd3481yak93yhbvy165"; + }) + ]; + nativeBuildInputs = [ pkg-config meson |