* Dietlibc tar doesn't work on x86_64, use one statically linked with

  glibc.
* Doh!  $tar/bin/tar should have been $gnutar/bin/tar, so we copied
  /bin/tar!

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

4 files changed, 12 insertions, 6 deletions

diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
index 074a3313f5da..cc81747d6c2e 100644
--- a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
@@ -7,21 +7,21 @@
 
   staticToolsURL = {
     url = file:///tmp/tarballs/static-tools.tar.bz2;
-    sha1 = "4c72845335b373966341f1d4ca0b4b06904d1214";
+    sha1 = "312eab4537f0d3831089917d7d1e1bc44ecef41a";
   };
 
   binutilsURL = {
     url = file:///tmp/tarballs/binutils.tar.bz2;
-    sha1 = "5ad0bdf99a427ebb8e08ca90db952c3eeb5119a4";
+    sha1 = "6e0e3cfb6a16cc2eb273e8feeacf64cf5570351c";
   };
 
   gccURL = {
     url = file:///tmp/tarballs/gcc.tar.bz2;
-    sha1 = "7398e021fdd5d7c4b5a3bb158db6e7573fc1dc0f";
+    sha1 = "babaec0a04c55f7cfe8938438ca8f078eabdebe1";
   };
 
   glibcURL = {
     url = file:///tmp/tarballs/glibc.tar.bz2;
-    sha1 = "710b4a53425977858490f77188c7e2138b55a2dd";
+    sha1 = "c68839c95bf2af3275aa37369afdf01c3dbfd416";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2 b/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2
index 29b97f8a32c4..b63f6be0fe07 100755
--- a/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2
+++ b/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2
Binary files differdiff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index c3c76a8e2555..c0de7032a8bb 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -26,13 +26,19 @@ let
     
     inherit (pkgsDiet)
       coreutils findutils diffutils gnugrep
-      gnutar gzip bzip2 gnumake bash patch;
+      gzip bzip2 gnumake bash patch;
       
     gnused = pkgsDiet.gnused412; # 4.1.5 gives "Memory exhausted" errors
 
     # patchelf is C++, won't work with dietlibc.
     inherit (pkgsStatic) patchelf;
 
+    gnutar =
+      # Tar seems to be broken on dietlibc on x86_64.
+      if pkgs.stdenv.system == "i686-linux"
+      then pkgsDiet.gnutar
+      else pkgsStatic.gnutar;
+
     gawk = 
       # Dietlibc only provides sufficient math functions (fmod, sin,
       # cos, etc.) on i686.  On other platforms, use Glibc.
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.sh b/pkgs/stdenv/linux/make-bootstrap-tools.sh
index fce5d280da30..c4f5f55bc451 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.sh
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.sh
@@ -24,7 +24,7 @@ nukeRefs $out/in-nixpkgs/bash
 cp $bzip2/bin/bunzip2 $out/in-nixpkgs
 cp $coreutils/bin/cp $out/in-nixpkgs
 bzip2 < $curl/bin/curl > $out/in-nixpkgs/curl.bz2
-cp $tar/bin/tar $out/in-nixpkgs
+cp $gnutar/bin/tar $out/in-nixpkgs
 nukeRefs $out/in-nixpkgs/tar
 bzip2 $out/in-nixpkgs/tar
 chmod +x $out/in-nixpkgs/*.bz2