diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2015-03-04 21:35:57 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-03-04 21:36:09 -0800 |
| commit | 3ea2aa4136f4f926e4a981011041564590f84450 (patch) | |
| tree | 44899296e964848d63d4407a1fad8f57ecf41963 /pkgs/stdenv/darwin | |
| parent | 19a749460072592568fee7387a3a888a83d4c9ca (diff) | |
| download | nixlib-3ea2aa4136f4f926e4a981011041564590f84450.tar nixlib-3ea2aa4136f4f926e4a981011041564590f84450.tar.gz nixlib-3ea2aa4136f4f926e4a981011041564590f84450.tar.bz2 nixlib-3ea2aa4136f4f926e4a981011041564590f84450.tar.lz nixlib-3ea2aa4136f4f926e4a981011041564590f84450.tar.xz nixlib-3ea2aa4136f4f926e4a981011041564590f84450.tar.zst nixlib-3ea2aa4136f4f926e4a981011041564590f84450.zip | |
stdenv/darwin: choose sdkroot based xcrun default
Diffstat (limited to 'pkgs/stdenv/darwin')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 2502882123eb..c415a297d845 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -50,10 +50,9 @@ rec { stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" xargsFlags=" " export MACOSX_DEPLOYMENT_TARGET=10.7 - 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 SDKROOT=$(/usr/bin/xcrun --sdk macosx$(/usr/bin/xcrun --show-sdk-version) --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 CMAKE_OSX_ARCHITECTURES=x86_64 ''; |