From 729e7295cf7b3205fcfa72544c1195c03de11c3d Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 13 Aug 2020 17:25:13 -0700 Subject: [PATCH] meson: Add upstream patch to stop failing on skipped tests https://github.com/mesonbuild/meson/pull/7525 Signed-off-by: Anders Kaseorg --- pkgs/development/tools/build-managers/meson/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index c32635d80e1e..a1c94fa1fce4 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