From 661dfd834787f157b70597f9f0f3e7202ba74332 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 22 Apr 2022 11:01:47 +0000 Subject: [PATCH] pkgsMusl.coreutils: fix build on aarch64 I suspect this issue is caused by the very old version of diffutils we have in the aarch64+musl bootstrap tools, so hopefully we can re-enable the tests once we have newer bootstrap tools. --- pkgs/tools/misc/coreutils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 86a91a09c3eb..da60a80f77fc 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -113,8 +113,10 @@ stdenv.mkDerivation (rec { # Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 + # On aarch64+musl, test-init.sh fails due to a segfault in diff. doCheck = stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl) + && !(stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) && !stdenv.isAarch32; # Prevents attempts of running 'help2man' on cross-built binaries.