JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86_64 darwin related changes

Browse Source 
svn path=/nixpkgs/trunk/; revision=18665
This commit is contained in:
Rob Vermaas 2009-11-27 10:16:42 +00:00
parent fe10a3aed5
commit d8800474f7
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/python/2.5/default.nix
View File

@ -82,4 +82,4 @@ stdenv.mkDerivation ( {
# - On Darwin, `python.exe' fails with "Bus Error".
platforms = stdenv.lib.platforms.allBut "i686-darwin";
};
} // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) )
} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) )

2
pkgs/development/interpreters/python/2.6/default.nix
View File

@ -89,4 +89,4 @@ stdenv.mkDerivation ( {
meta = {
platforms = stdenv.lib.platforms;
};
} // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch]; } else {} ) )
} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch]; } else {} ) )

2
pkgs/development/libraries/openssl/default.nix
View File

@ -18,4 +18,4 @@ stdenv.mkDerivation (rec {
homepage = http://www.openssl.org/;
description = "A cryptographic library that implements the SSL and TLS protocols";
};
} // (if stdenv.system == "i686-darwin" then { patches = [ ./darwin-arch.patch ]; } else {}))
} // (if stdenv.isDarwin then { patches = [ ./darwin-arch.patch ]; } else {}))

2
pkgs/tools/text/gnugrep/default.nix
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.