diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 16:33:54 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 16:35:13 +0100 |
| commit | e575d739da8419620d721e6ffaf5f30c8f1d60d8 (patch) | |
| tree | 33319bd409766f18425b3f68ace47506821082f7 /pkgs/stdenv | |
| parent | 7495c61d49208a9fc90b937bca548d9005ff17c8 (diff) | |
| download | nixlib-e575d739da8419620d721e6ffaf5f30c8f1d60d8.tar nixlib-e575d739da8419620d721e6ffaf5f30c8f1d60d8.tar.gz nixlib-e575d739da8419620d721e6ffaf5f30c8f1d60d8.tar.bz2 nixlib-e575d739da8419620d721e6ffaf5f30c8f1d60d8.tar.lz nixlib-e575d739da8419620d721e6ffaf5f30c8f1d60d8.tar.xz nixlib-e575d739da8419620d721e6ffaf5f30c8f1d60d8.tar.zst nixlib-e575d739da8419620d721e6ffaf5f30c8f1d60d8.zip | |
Set SDKROOT etc. in stdenvNative
Fixes a build failure in gawk with Xcode 6.1 on 10.9.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/stdenv/darwin/prehook.nix | 9 | ||||
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 4 |
3 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 9131f0742d00..45d417cdce73 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -11,13 +11,7 @@ import ../generic rec { export NIX_IGNORE_LD_THROUGH_GCC=1 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.9 - export SDKROOT=$(/usr/bin/xcrun --sdk macosx10.9 --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" + ${import ./prehook.nix} ''; initialPath = (import ../common-path.nix) {pkgs = pkgs;}; diff --git a/pkgs/stdenv/darwin/prehook.nix b/pkgs/stdenv/darwin/prehook.nix new file mode 100644 index 000000000000..f38cd517f00e --- /dev/null +++ b/pkgs/stdenv/darwin/prehook.nix @@ -0,0 +1,9 @@ +'' + dontFixLibtool=1 + stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" + xargsFlags=" " + export MACOSX_DEPLOYMENT_TARGET=10.9 + export SDKROOT=$(/usr/bin/xcrun --sdk macosx10.9 --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" +'' diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index b0ed7c93f788..213f844365e1 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -22,9 +22,7 @@ rec { ${prehookBase} export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 - dontFixLibtool=1 - stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" - xargsFlags=" " + ${import ../darwin/prehook.nix} ''; prehookFreeBSD = '' |