* Override packages in stdenvLinux with those already built in earlier

  stages of the bootstrap process (i.e., stdenvLinuxBoot).
* Add those packages to the distribution.  We didn't do that before
  because it would cause them to be built twice.

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

2 files changed, 32 insertions, 5 deletions

diff --git a/pkgs/system/all-packages.nix b/pkgs/system/all-packages.nix
index 367ac1950349f..49a1877b6f375 100644
--- a/pkgs/system/all-packages.nix
+++ b/pkgs/system/all-packages.nix
@@ -11,6 +11,7 @@
 {system}: let {
   allPackages = import ./all-packages-generic.nix;
 
+
   # The native (i.e., impure) build environment.  This one uses the
   # tools installed on the system outside of the Nix environment,
   # i.e., the stuff in /bin, /usr/bin, etc.  This environment should
@@ -19,6 +20,7 @@
   stdenvNative = (import ../stdenv/native) {system = system;};
   stdenvNativePkgs = allPackages {system = system; stdenv = stdenvNative;};
 
+
   # The Nix build environment.
   stdenvNix = (import ../stdenv/nix) {
     bootStdenv = stdenvNative;
@@ -26,6 +28,7 @@
   };
   stdenvNixPkgs = allPackages {system = system; stdenv = stdenvNix;};
 
+
   # The Linux build environment consists of the Nix build environment
   # built against the GNU C Library.
   stdenvLinuxGlibc = stdenvNativePkgs.glibc;
@@ -40,7 +43,14 @@
     pkgs = stdenvLinuxBootPkgs;
     glibc = stdenvLinuxGlibc;
   };
-  stdenvLinuxPkgs = allPackages {system = system; stdenv = stdenvLinux;};
+  stdenvLinuxPkgs =
+    allPackages {system = system; stdenv = stdenvLinux;} //
+    {inherit (stdenvLinuxBootPkgs)
+      gzip bzip2 bash binutils coreutils diffutils findutils gawk gcc
+      gnumake gnused gnutar gnugrep wget;
+    } //
+    {glibc = stdenvLinuxGlibc;};
+
 
   # Select the right instantiation.
   body =
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index e37dba6661af3..032b27729e04c 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -1,14 +1,31 @@
 let {
   pkgs = import ./i686-linux.nix;
   body = 
-    [ pkgs.zip
+    [ pkgs.coreutils
+      pkgs.findutils
+      pkgs.diffutils
+      pkgs.gnused
+      pkgs.gnugrep
+      pkgs.gawk
+      pkgs.gnutar
+      pkgs.zip
       pkgs.unzip
-      pkgs.valgrind
-      pkgs.bisonnew
-      pkgs.flexnew
+      pkgs.gzip
+      pkgs.bzip2
+      pkgs.wget
       pkgs.par2cmdline
       pkgs.cksfv
       pkgs.graphviz
+      pkgs.bash
+      pkgs.binutils
+      pkgs.gnum4
+      pkgs.valgrind
+      pkgs.gnumake
+      pkgs.bisonnew
+      pkgs.flexnew
+      pkgs.gcc
+      pkgs.perl
+      pkgs.python
       pkgs.strategoxt093
       pkgs.libxml2
       pkgs.libxslt