diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-25 20:38:18 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-25 20:38:18 +0000 |
| commit | fa1a414aeea9926721ed2b87b74e3f3755538e3b (patch) | |
| tree | 5e4d6aea8bcd00c53b71a564ce9e0fe001751a84 /pkgs/tools/misc/coreutils | |
| parent | d15811bf78eda2aacfa5274822ba07a911d9bca6 (diff) | |
| parent | c5098ff56e44ab8eeae3a067838cf4e139196d52 (diff) | |
| download | nixlib-fa1a414aeea9926721ed2b87b74e3f3755538e3b.tar nixlib-fa1a414aeea9926721ed2b87b74e3f3755538e3b.tar.gz nixlib-fa1a414aeea9926721ed2b87b74e3f3755538e3b.tar.bz2 nixlib-fa1a414aeea9926721ed2b87b74e3f3755538e3b.tar.lz nixlib-fa1a414aeea9926721ed2b87b74e3f3755538e3b.tar.xz nixlib-fa1a414aeea9926721ed2b87b74e3f3755538e3b.tar.zst nixlib-fa1a414aeea9926721ed2b87b74e3f3755538e3b.zip | |
Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that
well svn path=/nixpkgs/branches/stdenv-updates/; revision=21975
Diffstat (limited to 'pkgs/tools/misc/coreutils')
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 6f7c0923d99f..2bd24b302bea 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,6 +1,8 @@ -{stdenv, fetchurl, aclSupport ? false, acl, perl, gmp}: +{ stdenv, fetchurl, aclSupport ? false, acl ? null, perl, gmp ? null}: -stdenv.mkDerivation rec { +assert aclSupport -> acl != null; + +stdenv.mkDerivation (rec { name = "coreutils-8.4"; src = fetchurl { @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), # and {Open,Free}BSD. - doCheck = (stdenv ? glibc); + doCheck = (stdenv ? glibc) && (cross == null); meta = { homepage = http://www.gnu.org/software/coreutils/; |