From 85e1bc7d34b2f9902c3deaec2363c38323449910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 25 May 2010 20:41:53 +0000
Subject: [PATCH] Fixing coreutils - I did not merge that well enough

svn path=/nixpkgs/branches/stdenv-updates/; revision=21976
---
 pkgs/tools/misc/coreutils/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 2bd24b302be..a5631079fbb 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/;