diff options
| author | Anders Kaseorg <andersk@mit.edu> | 2020-08-13 17:25:13 -0700 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-08-14 08:23:53 +0200 |
| commit | dbac38cf0ed1666d433e13a77f7933a439c22bed (patch) | |
| tree | 4bbfa095badbb7579db65ea97e73ae3427caadfc /pkgs/development/tools/build-managers/meson/default.nix | |
| parent | 66a5125b30026676e76bc0b21cf3573641aad174 (diff) | |
| download | nixpkgs-dbac38cf0ed1666d433e13a77f7933a439c22bed.tar nixpkgs-dbac38cf0ed1666d433e13a77f7933a439c22bed.tar.gz nixpkgs-dbac38cf0ed1666d433e13a77f7933a439c22bed.tar.bz2 nixpkgs-dbac38cf0ed1666d433e13a77f7933a439c22bed.tar.lz nixpkgs-dbac38cf0ed1666d433e13a77f7933a439c22bed.tar.xz nixpkgs-dbac38cf0ed1666d433e13a77f7933a439c22bed.tar.zst nixpkgs-dbac38cf0ed1666d433e13a77f7933a439c22bed.zip | |
meson: Add upstream patch to stop failing on skipped tests
https://github.com/mesonbuild/meson/pull/7525 Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'pkgs/development/tools/build-managers/meson/default.nix')
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index c32635d80e1..a1c94fa1fce 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -4,6 +4,7 @@ , writeTextDir , substituteAll , pkgsHostHost +, fetchpatch }: python3.pkgs.buildPythonApplication rec { @@ -16,6 +17,13 @@ python3.pkgs.buildPythonApplication rec { }; patches = [ + # Meson 0.55.0 incorrectly considers skipped tests as failures, + # which makes some packages like gjs fail to build. + (fetchpatch { + url = "https://github.com/mesonbuild/meson/commit/7db49db67d4aa7582cf46feb7157235e66aa95b1.diff"; + sha256 = "1chq52sgk24afdlswssr8n8p6fa2wz8rjlxvkjhpqg1kg3qnqc9p"; + }) + # Upstream insists on not allowing bindir and other dir options # outside of prefix for some reason: # https://github.com/mesonbuild/meson/issues/2561 |