* 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/generic/builder.sh

@@ -6,12 +6,13 @@ done
 
 mkdir $out
 
-sed \
-    -e "s^@preHook@^$preHook^g" \
+echo "$preHook" > $out/setup
+cat "$setup" >> $out/setup
+
+sed -i "$out/setup" \
     -e "s^@initialPath@^$initialPath^g" \
     -e "s^@gcc@^$gcc^g" \
-    -e "s^@shell@^$shell^g" \
-    < "$setup" > "$out/setup"
+    -e "s^@shell@^$shell^g"
 
 # Allow the user to install stdenv using nix-env and get the packages
 # in stdenv.