* Use the generic substituter in the generation of stdenv and gcc-wrapper.

svn path=/nixpkgs/trunk/; revision=2269

pkgs/stdenv/generic/builder.sh

@@ -5,18 +5,18 @@ p4=$param4
 p5=$param5
 
 . $stdenv/setup
+. $substitute
 
-mkdir $out || exit 1
+mkdir $out
 
-sed \
- -e "s^@preHook@^$preHook^g" \
- -e "s^@postHook@^$postHook^g" \
- -e "s^@initialPath@^$initialPath^g" \
- -e "s^@gcc@^$gcc^g" \
- -e "s^@shell@^$shell^g" \
- -e "s^@param1@^$p1^g" \
- -e "s^@param2@^$p2^g" \
- -e "s^@param3@^$p3^g" \
- -e "s^@param4@^$p4^g" \
- -e "s^@param5@^$p5^g" \
- < $setup > $out/setup || exit 1
+substitute "$setup" "$out/setup" \
+    --subst-var preHook \
+    --subst-var postHook \
+    --subst-var initialPath \
+    --subst-var gcc \
+    --subst-var shell \
+    --subst-var-by param1 "$p1" \
+    --subst-var-by param2 "$p2" \
+    --subst-var-by param3 "$p3" \
+    --subst-var-by param4 "$p4" \
+    --subst-var-by param5 "$p5"