diff options
| author | Joel Taylor <me@joelt.io> | 2015-03-01 20:19:36 -0800 |
|---|---|---|
| committer | Joel Taylor <me@joelt.io> | 2015-03-01 20:19:36 -0800 |
| commit | ec019485d6b84d680d1a91a8f7ac8d94a57c95f4 (patch) | |
| tree | 10f0016359f3a0975634bffd721b0ba299c73a43 /pkgs/stdenv/darwin | |
| parent | 4a779f4d9a5b85e227a94b6b3bc5f866e8c38aaa (diff) | |
| download | nixlib-ec019485d6b84d680d1a91a8f7ac8d94a57c95f4.tar nixlib-ec019485d6b84d680d1a91a8f7ac8d94a57c95f4.tar.gz nixlib-ec019485d6b84d680d1a91a8f7ac8d94a57c95f4.tar.bz2 nixlib-ec019485d6b84d680d1a91a8f7ac8d94a57c95f4.tar.lz nixlib-ec019485d6b84d680d1a91a8f7ac8d94a57c95f4.tar.xz nixlib-ec019485d6b84d680d1a91a8f7ac8d94a57c95f4.tar.zst nixlib-ec019485d6b84d680d1a91a8f7ac8d94a57c95f4.zip | |
Revert "Fix building on Xcode"
This reverts commit dad86b4f544db4d497e4bbe769dec0bb3e9cfbd7.
Diffstat (limited to 'pkgs/stdenv/darwin')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 89c8c6ee2852..2502882123eb 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -50,10 +50,10 @@ rec { stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" xargsFlags=" " export MACOSX_DEPLOYMENT_TARGET=10.7 - # Use the SDK from Xcode by default, falling back to /usr/{lib,include}. - export SDKROOT=$(/usr/bin/xcrun --sdk macosx10.9 --show-sdk-path 2> /dev/null || echo /) - 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" + export SDKROOT= + export SDKROOT_X=/ # FIXME: impure! + export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT_X/usr/include -F$SDKROOT_X/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" + export NIX_LDFLAGS_AFTER+=" -L$SDKROOT_X/usr/lib" export CMAKE_OSX_ARCHITECTURES=x86_64 ''; |