summary refs log tree commit diff
path: root/pkgs/stdenv/darwin
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-03-23 15:56:09 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-03-23 16:04:37 +0100
commitead7762573176d7f795ea877f600982b40537861 (patch)
tree9dd782d7dd6d1da3aae3f5e3004d4dca6cd1fe61 /pkgs/stdenv/darwin
parent355e3e90b350edfbc5a50d3a84b1fe752300b023 (diff)
downloadnixpkgs-ead7762573176d7f795ea877f600982b40537861.tar
nixpkgs-ead7762573176d7f795ea877f600982b40537861.tar.gz
nixpkgs-ead7762573176d7f795ea877f600982b40537861.tar.bz2
nixpkgs-ead7762573176d7f795ea877f600982b40537861.tar.lz
nixpkgs-ead7762573176d7f795ea877f600982b40537861.tar.xz
nixpkgs-ead7762573176d7f795ea877f600982b40537861.tar.zst
nixpkgs-ead7762573176d7f795ea877f600982b40537861.zip
stdenv-darwin: Use --sdk macosx10.9
Otherwise builds fail on Mac OS X 10.9 with Xcode 6.1. This is because
"xcrun --show-sdk-version" returns 10.10, which doesn't work.
Diffstat (limited to 'pkgs/stdenv/darwin')
-rw-r--r--pkgs/stdenv/darwin/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 89d5f8df313..88275aa0e79 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -50,7 +50,7 @@ rec {
     stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
     xargsFlags=" "
     export MACOSX_DEPLOYMENT_TARGET=10.7
-    export SDKROOT=$(/usr/bin/xcrun --sdk macosx$(/usr/bin/xcrun --show-sdk-version) --show-sdk-path 2> /dev/null || echo /)
+    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 CMAKE_OSX_ARCHITECTURES=x86_64