From 45584b3e5a7d25bf7f9dcb4e0a1888c98330c53a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 2 Oct 2023 23:49:26 +0000 Subject: [PATCH] diffutils: disable tests on aarch64 musl The tests have never worked on aarch64 musl, so this restores the previous behaviour on that platform of building successfully even though the tests don't pass. Since the tests work on x86_64 musl, and not aarch64 musl, my best guess having not looked too closely is that the difference is because aarch64 is stuck on ancient bootstrap tools for musl that cause all sorts of problems. Hopefully we can revert this once the bootstrap tools are updated. Having diffutils building is a prerequisite to doing that. Fixes: 9588972fe983 ("diffutils: 3.9 -> 3.10") --- pkgs/tools/text/diffutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 040f363fa55d..35e0fb5e6b96 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; - doCheck = true; + doCheck = !(stdenv.buildPlatform.isAarch64 && stdenv.buildPlatform.isMusl); meta = with lib; { homepage = "https://www.gnu.org/software/diffutils/diffutils.html";