summary refs log tree commit diff
path: root/pkgs/tools/misc/coreutils
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-05-25 20:41:53 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-05-25 20:41:53 +0000
commit85e1bc7d34b2f9902c3deaec2363c38323449910 (patch)
treed378ea7feccb0202561eaf173f58234de8d671a3 /pkgs/tools/misc/coreutils
parentfa1a414aeea9926721ed2b87b74e3f3755538e3b (diff)
downloadnixlib-85e1bc7d34b2f9902c3deaec2363c38323449910.tar
nixlib-85e1bc7d34b2f9902c3deaec2363c38323449910.tar.gz
nixlib-85e1bc7d34b2f9902c3deaec2363c38323449910.tar.bz2
nixlib-85e1bc7d34b2f9902c3deaec2363c38323449910.tar.lz
nixlib-85e1bc7d34b2f9902c3deaec2363c38323449910.tar.xz
nixlib-85e1bc7d34b2f9902c3deaec2363c38323449910.tar.zst
nixlib-85e1bc7d34b2f9902c3deaec2363c38323449910.zip
Fixing coreutils - I did not merge that well enough
svn path=/nixpkgs/branches/stdenv-updates/; revision=21976
Diffstat (limited to 'pkgs/tools/misc/coreutils')
-rw-r--r--pkgs/tools/misc/coreutils/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 2bd24b302bea..a5631079fbb1 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -2,7 +2,7 @@
 
 assert aclSupport -> acl != null;
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "coreutils-8.4";
 
   src = fetchurl {
@@ -22,13 +22,14 @@ stdenv.mkDerivation (rec {
     # Needed for fstatfs()
     # I don't know why it is not properly detected cross building with glibc.
     configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ];
+    doCheck = false;
   };
 
   # The tests are known broken on Cygwin
   # (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) && (cross == null);
+  doCheck = (stdenv ? glibc);
 
   meta = {
     homepage = http://www.gnu.org/software/coreutils/;