* 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
2006-12-27 18:14:57 +00:00
parent f6d923febc
commit 138c0ae751
15 changed files with 160 additions and 1537 deletions
@@ -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