* Merge the new generic builder.

* Removed substitute, it's part of the generic builder now.
* stdenv-initial (Linux): use the real generic builder script.  This
  does require that sed is in the path of the builder of the initial
  stdenv.

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

pkgs/stdenv/linux/default.nix

@@ -80,6 +80,7 @@ rec {
       name = "stdenv-linux-initial";
       builder = bootstrapTools.bash;
       args = [ ./scripts/builder-stdenv-initial.sh ];
+      stdenvScript = ../generic/setup.sh;
       inherit system staticTools curl;
     } // {
       # !!! too much duplication with stdenv/generic/default.nix

pkgs/stdenv/linux/scripts/builder-stdenv-initial.sh

@@ -4,7 +4,4 @@ PATH=$staticTools/bin
 
 mkdir $out
 
-cat > $out/setup <<EOF
-PATH=$staticTools/bin
-EOF
-
+sed -e "s^@initialPath@^$staticTools^" -e "s^@preHook@^^" -e "s^@postHook@^^" < $stdenvScript > $out/setup