Fixing coreutils - I did not merge that well enough
svn path=/nixpkgs/branches/stdenv-updates/; revision=21976
This commit is contained in:
parent
fa1a414aee
commit
85e1bc7d34
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
assert aclSupport -> acl != null;
|
assert aclSupport -> acl != null;
|
||||||
|
|
||||||
stdenv.mkDerivation (rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "coreutils-8.4";
|
name = "coreutils-8.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
@ -22,13 +22,14 @@ stdenv.mkDerivation (rec {
|
|||||||
# Needed for fstatfs()
|
# Needed for fstatfs()
|
||||||
# I don't know why it is not properly detected cross building with glibc.
|
# I don't know why it is not properly detected cross building with glibc.
|
||||||
configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ];
|
configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ];
|
||||||
|
doCheck = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
# The tests are known broken on Cygwin
|
# The tests are known broken on Cygwin
|
||||||
# (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
|
# (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
|
||||||
# Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
|
# Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
|
||||||
# and {Open,Free}BSD.
|
# and {Open,Free}BSD.
|
||||||
doCheck = (stdenv ? glibc) && (cross == null);
|
doCheck = (stdenv ? glibc);
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.gnu.org/software/coreutils/;
|
homepage = http://www.gnu.org/software/coreutils/;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user