diff options
author | Nick Cao <nickcao@nichi.co> | 2022-01-14 11:19:02 +0800 |
---|---|---|
committer | Nick Cao <nickcao@nichi.co> | 2022-01-15 17:25:08 +0800 |
commit | e35d74c3ecff7f579cb7c60d3eb96b6db774721b (patch) | |
tree | de6ec87085a6c14fd9f53677df8aef738a8d7ae3 /pkgs/development/libraries/gobject-introspection | |
parent | cf47e66aab1d42a0fb8c773b1ac5ff1d67d1b2a6 (diff) |
gobject-introspection: prepare for meson 0.61
Diffstat (limited to 'pkgs/development/libraries/gobject-introspection')
-rw-r--r-- | pkgs/development/libraries/gobject-introspection/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 25b7770101d13..667d50ca4d8b8 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -46,6 +46,15 @@ stdenv.mkDerivation rec { src = ./absolute_shlib_path.patch; inherit nixStoreDir; }) + # Fix build with meson 0.61.0 + (fetchurl { + url = "https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/827494d6415b696a98fa195cbd883b50cc893bfc.patch"; + sha256 = "sha256-imVWzU760FRsX+eXREQDQ6mDcmzZ5ASLT9rBf4oyBGQ="; + }) + (fetchurl { + url = "https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2.patch"; + sha256 = "sha256-o7a0qDT5IYcYcz8toeZu+nPj3SwS52sNgmxgzsmlp4Q="; + }) ] ++ lib.optionals x11Support [ # Hardcode the cairo shared library path in the Cairo gir shipped with this package. # https://github.com/NixOS/nixpkgs/issues/34080 |