chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-13 11:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28991 from copumpkin/backport-coreutils-fix-17.09

Browse Source 
coreutils: fix on Darwin
This commit is contained in:
Tim Steinbach
2017-09-04 16:10:55 -04:00
committed by GitHub
parent 14fbe46429 4951f1f01c
commit a98c19fe2c
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,8 +24,7 @@ stdenv.mkDerivation rec {
# FIXME needs gcc 4.9 in bootstrap tools
hardeningDisable = [ "stackprotector" ];
patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
++ optional hostPlatform.isDarwin stdenv.secure-format-patch;
patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
# The test tends to fail on btrfs and maybe other unusual filesystems.
postPatch = optionalString (!hostPlatform.isDarwin) ''