Merge pull request #109331 from zhaofengli/coreutils-getdents

coreutils: Apply sys_getdents patch unconditionally
This commit is contained in:
Jörg Thalheim 2021-01-14 05:50:56 +00:00 committed by GitHub
commit db65f1c255
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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;