* Finally we have a working stdenvLinux again.

  On the downside, the build process of stdenvLinux builds gcc 9 times
  (3 x 3 bootstrap stages).  That's a bit excessive.

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

1 files changed, 6 insertions, 2 deletions

diff --git a/pkgs/stdenv/initial/default.nix b/pkgs/stdenv/initial/default.nix
index 6a62751b0370..4c67fee7cd5a 100644
--- a/pkgs/stdenv/initial/default.nix
+++ b/pkgs/stdenv/initial/default.nix
@@ -7,21 +7,25 @@
 
 let {
 
+  shell = "/bin/sh";
+
   body = 
 
     derivation {
       inherit system name;
-      builder = "/bin/sh";
+      builder = shell;
       args = ["-e" ./builder.sh];
     }
 
     // {
       mkDerivation = attrs: derivation (attrs // {
-        builder = "/bin/sh";
+        builder = shell;
         args = ["-e" attrs.builder];
         stdenv = body;
         system = body.system;
       });
+
+      inherit shell;
     };
 
 }