diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-08 20:13:23 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-08 20:13:23 +0200 |
| commit | 52d9c93abef582cfa32d94397aa86f0aa169917c (patch) | |
| tree | fd32d1eb551687c92a10487a0a877018791b73ff /pkgs/stdenv/nix/default.nix | |
| parent | 629f7d055a8ec6815400affbfdd0a9f3384b0e2a (diff) | |
| parent | 777617f987c1e3e44f0f399582bc1b2e2f113c42 (diff) | |
| download | nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.gz nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.bz2 nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.lz nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.xz nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.zst nixpkgs-52d9c93abef582cfa32d94397aa86f0aa169917c.zip | |
Merge 'staging' into master
Diffstat (limited to 'pkgs/stdenv/nix/default.nix')
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 78e5b84a841..a496a819a6d 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -7,16 +7,18 @@ import ../generic rec { '' export NIX_ENFORCE_PURITY=1 export NIX_IGNORE_LD_THROUGH_GCC=1 - - if [ "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system" = "x86_64-darwin" ]; then - export NIX_ENFORCE_PURITY= - export NIX_DONT_SET_RPATH=1 - export NIX_NO_SELF_RPATH=1 - dontFixLibtool=1 - stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" - xargsFlags=" " - fi - ''; + '' + (if stdenv.isDarwin then '' + export NIX_ENFORCE_PURITY= + export NIX_DONT_SET_RPATH=1 + export NIX_NO_SELF_RPATH=1 + dontFixLibtool=1 + stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" + xargsFlags=" " + export MACOSX_DEPLOYMENT_TARGET=10.6 + export SDKROOT=$(/usr/bin/xcrun --show-sdk-path 2> /dev/null || true) + export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" + export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib" + '' else ""); initialPath = (import ../common-path.nix) {pkgs = pkgs;}; |