summary refs log tree commit diff
path: root/pkgs/stdenv/linux/make-bootstrap-tools.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/stdenv/linux/make-bootstrap-tools.nix')
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools.nix8
1 files changed, 7 insertions, 1 deletions
diff --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.