* Prepend the "prehook" rather than sourcing it.

* Don't call xargs with the -r flag in the Darwin bootstrap.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31703

pkgs/stdenv/nix/default.nix

@@ -2,7 +2,21 @@
 
 import ../generic {
   name = "stdenv-nix";
-  preHook = ./prehook.sh;
+  
+  preHook =
+    ''
+      export NIX_ENFORCE_PURITY=1
+      export NIX_IGNORE_LD_THROUGH_GCC=1
+
+      if [ "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system" = "x86_64-darwin" ]; then
+        export NIX_DONT_SET_RPATH=1
+        export NIX_NO_SELF_RPATH=1
+        dontFixLibtool=1
+        stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" 
+        xargsFlags=" "
+      fi
+    '';
+
   initialPath = (import ../common-path.nix) {pkgs = pkgs;};
 
   system = stdenv.system;