Updating from trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
This commit is contained in:
Lluís Batlle i Rossell
2009-12-10 14:48:45 +00:00
124 changed files with 1304 additions and 609 deletions

View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [pcre];
doCheck = if stdenv.system == "i686-darwin" then false else true;
doCheck = if stdenv.isDarwin then false else true;
# On Mac OS X, force use of mkdir -p, since Grep's fallback
# (./install-sh) is broken.