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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-04-18 13:00:40 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, perl, gmp ? null
{ lib, stdenv, fetchurl, perl, xz, gmp ? null
, aclSupport ? false, acl ? null
, selinuxSupport? false, libselinux ? null, libsepol ? null
, autoconf, automake114x, texinfo
@@ -32,9 +32,11 @@ let
sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh
'';
outputs = [ "out" "info" ];
nativeBuildInputs = [ perl xz.bin ];
configureFlags = optionalString stdenv.isSunOS "ac_cv_func_inotify_init=no";
nativeBuildInputs = [ perl ];
buildInputs = [ gmp ]
++ optional aclSupport acl
++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ] # due to patch