From de25bee83d1afee9867640e4fa4e46d82302c03a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 27 Oct 2006 20:14:19 +0000
Subject: [PATCH] * Of course, the latest GNU tar has the same gnulib header
 file shit   as coreutils.

svn path=/nixpkgs/trunk/; revision=6880
---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +-
 pkgs/tools/archivers/gnutar/1.15.1.nix     | 9 +++++++++
 pkgs/top-level/all-packages.nix            | 5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/archivers/gnutar/1.15.1.nix

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 60b659f58079..a92e591b44fa 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -63,4 +63,4 @@ let
     allowedReferences = [];
   };
 
-in generator
+in generator.gnutar
diff --git a/pkgs/tools/archivers/gnutar/1.15.1.nix b/pkgs/tools/archivers/gnutar/1.15.1.nix
new file mode 100644
index 000000000000..841280d5730e
--- /dev/null
+++ b/pkgs/tools/archivers/gnutar/1.15.1.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "gnutar-1.15.1";
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/tar-1.15.1.tar.bz2;
+    md5 = "57da3c38f8e06589699548a34d5a5d07";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15a1fad2bf79..e4cb1989f683 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -314,7 +314,10 @@ rec {
   };
 
   gnutar = useFromStdenv (stdenv ? gnutar) stdenv.gnutar
-    (import ../tools/archivers/gnutar {
+    ((if stdenv ? isDietLibC
+      then import ../tools/archivers/gnutar/1.15.1.nix
+      else import ../tools/archivers/gnutar)
+    {
       inherit fetchurl stdenv;
     });