JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coreutils: Apply sys_getdents patch unconditionally

Browse Source 
Also breaks build for riscv64.
This commit is contained in:
Zhaofeng Li 2020-12-27 01:11:42 -08:00
parent 0f111a19ca
commit 091a4ef01e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/misc/coreutils/default.nix
View File

@ -29,9 +29,8 @@ stdenv.mkDerivation (rec {
sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo="; sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo=";
}; };
patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch patches = [ ./sys-getdents-undeclared.patch ]
# included on coreutils master; TODO: apply unconditionally, I guess ++ optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch
# fix gnulib tests on 32-bit ARM. Included on coreutils master. # fix gnulib tests on 32-bit ARM. Included on coreutils master.
# https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html
++ optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; ++ optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch;