public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: Add upstream patch to stop failing on skipped tests

Browse Source 
https://github.com/mesonbuild/meson/pull/7525

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2020-08-13 17:25:13 -07:00 committed by Frederik Rietdijk
parent 66a5125b30
commit dbac38cf0e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/build-managers/meson/default.nix
View File

@ -4,6 +4,7 @@
, writeTextDir , writeTextDir
, substituteAll , substituteAll
, pkgsHostHost , pkgsHostHost
, fetchpatch
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
@ -16,6 +17,13 @@ python3.pkgs.buildPythonApplication rec {
}; };
patches = [ 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 # Upstream insists on not allowing bindir and other dir options
# outside of prefix for some reason: # outside of prefix for some reason:
# https://github.com/mesonbuild/meson/issues/2561 # https://github.com/mesonbuild/meson/issues/2561