From bcece861e80203308b0eaee1a7711589348d1a6f Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 25 Jan 2021 18:12:26 -0800 Subject: [PATCH] coreutils: fix build on riscv RISC-V has the same issue as ARM64 with coreutils. Fixes pkgsCross.riscv64.coreutils --- pkgs/tools/misc/coreutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 4a4a9343c6a..d30a4d00ba1 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (rec { patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch # included on coreutils master; TODO: apply unconditionally, I guess - ++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch + ++ optional (with stdenv.hostPlatform; isAarch64 || isRiscV) ./sys-getdents-undeclared.patch # fix gnulib tests on 32-bit ARM. Included on coreutils master. # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html ++ optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch;