From 091a4ef01e5f5d8e6d4f32e19f6212a4423eb5a2 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 27 Dec 2020 01:11:42 -0800 Subject: [PATCH] coreutils: Apply sys_getdents patch unconditionally Also breaks build for riscv64. --- pkgs/tools/misc/coreutils/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 1a0c9b2e10c8..9c811a16e74d 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -29,9 +29,8 @@ stdenv.mkDerivation (rec { sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo="; }; - 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 + patches = [ ./sys-getdents-undeclared.patch ] + ++ optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.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;