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

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

pkgs/build-support/substitute/substitute.sh

@@ -22,6 +22,13 @@ substitute() {
             sedArgs=("${sedArgs[@]}" "-e" "s^@${varName}@^${!varName}^g")
         fi
 
+        if test "$p" = "--subst-var-by"; then
+            varName=${params[$((n + 1))]}
+            replacement=${params[$((n + 2))]}
+            n=$((n + 2))
+            sedArgs=("${sedArgs[@]}" "-e" "s^@${varName}@^$replacement^g")
+        fi
+
     done
 
     sed "${sedArgs[@]}" < "$input" > "$output".tmp