From e575d739da8419620d721e6ffaf5f30c8f1d60d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Nov 2014 16:33:54 +0100
Subject: Set SDKROOT etc. in stdenvNative

Fixes a build failure in gawk with Xcode 6.1 on 10.9.
---
 pkgs/stdenv/darwin/default.nix | 8 +-------
 pkgs/stdenv/darwin/prehook.nix | 9 +++++++++
 pkgs/stdenv/native/default.nix | 4 +---
 3 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/stdenv/darwin/prehook.nix

(limited to 'pkgs')

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 = ''
-- 
cgit 1.4.1