diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-24 21:53:46 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-24 21:53:46 +0200 |
| commit | ac8775dd968f49a37260c53690d072faf91aca6f (patch) | |
| tree | df2db290beaac75acb2f0dba58d6afe8e938a236 /pkgs/stdenv/nix/default.nix | |
| parent | bf0d518c6733873a67989c4781d56f8b0fccbc46 (diff) | |
| download | nixlib-ac8775dd968f49a37260c53690d072faf91aca6f.tar nixlib-ac8775dd968f49a37260c53690d072faf91aca6f.tar.gz nixlib-ac8775dd968f49a37260c53690d072faf91aca6f.tar.bz2 nixlib-ac8775dd968f49a37260c53690d072faf91aca6f.tar.lz nixlib-ac8775dd968f49a37260c53690d072faf91aca6f.tar.xz nixlib-ac8775dd968f49a37260c53690d072faf91aca6f.tar.zst nixlib-ac8775dd968f49a37260c53690d072faf91aca6f.zip | |
$xcodePath -> $SDKROOT
SDKROOT is standard. In particular, this fixes the cmake build on Mac OS X 10.9.
Diffstat (limited to 'pkgs/stdenv/nix/default.nix')
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index b540456afa4a..2301b8b8f2b1 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -15,9 +15,9 @@ import ../generic rec { stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" xargsFlags=" " export MACOSX_DEPLOYMENT_TARGET=10.6 - xcodePath=$(/usr/bin/xcrun --show-sdk-path 2> /dev/null || true) - export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $xcodePath/usr/include -F$xcodePath/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" - export NIX_LDFLAGS_AFTER+=" -L$xcodePath/usr/lib" + SDKROOT=$(/usr/bin/xcrun --show-sdk-path 2> /dev/null || true) + export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$xcodePath/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" + export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib" '' else ""); initialPath = (import ../common-path.nix) {pkgs = pkgs;}; |