6 files changed, 5 insertions, 41 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 25fe39adb49..1c71f9defaf 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -7,13 +7,13 @@ let
     # stdenv-linux's dependencies, rather than building new ones with
     # dietlibc.
     bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv)
-      ["coreutils" "gnused" "gnutar" "bzip2" "bash" "patch" "patchelf"];
+      ["coreutils" "gnused" "gnutar" "gnugrep" "bzip2" "bash" "patch" "patchelf"];
   };
 
   generator = pkgs.stdenv.mkDerivation {
     name = "bootstrap-tools-generator";
     builder = ./make-bootstrap-tools.sh;
-    inherit (pkgsDiet) coreutils gnused gnutar bzip2 bash patch;
+    inherit (pkgsDiet) coreutils gnused gnugrep gnutar bzip2 bash patch;
     curl = pkgsDiet.realCurl;
 
     # The result should not contain any references (store paths) so
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.sh b/pkgs/stdenv/linux/make-bootstrap-tools.sh
index 3d3878ac505..fee37373c92 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.sh
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.sh
@@ -35,12 +35,14 @@ rm tools/bin/groups # has references
 rm tools/bin/printf # idem
 
 cp $gnused/bin/* tools/bin
+cp $gnugrep/bin/* tools/bin
 cp $gnutar/bin/* tools/bin
 cp $bzip2/bin/bunzip2 tools/bin
 cp $patch/bin/* tools/bin
 
 nukeRefs tools/bin/sed
 nukeRefs tools/bin/tar
+nukeRefs tools/bin/grep
 
 #cp $patchelf/bin/* tools/bin
 
@@ -48,7 +50,7 @@ nukeRefs tools/bin/tar
 for i in $out/in-nixpkgs/* tools/bin/*; do
     if test -x $i; then
         chmod +w $i
-        strip -s $i
+        strip -s $i || true
     fi
 done
 
diff --git a/pkgs/tools/text/diffutils-diet/builder.sh b/pkgs/tools/text/diffutils-diet/builder.sh
deleted file mode 100644
index 6c508ed5614..00000000000
--- a/pkgs/tools/text/diffutils-diet/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-source $stdenv/setup
-if test -n "$coreutils"; then PATH=$coreutils/bin:$PATH; fi
-genericBuild
\ No newline at end of file
diff --git a/pkgs/tools/text/diffutils-diet/default.nix b/pkgs/tools/text/diffutils-diet/default.nix
deleted file mode 100644
index 17c1cdaf41e..00000000000
--- a/pkgs/tools/text/diffutils-diet/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, coreutils ? null, dietgcc}:
-
-stdenv.mkDerivation {
-  name = "diffutils-2.8.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/diffutils-2.8.1.tar.gz;
-    md5 = "71f9c5ae19b60608f6c7f162da86a428";
-  };
-  /* If no explicit coreutils is given, use the one from stdenv. */
-  inherit coreutils;
-  NIX_GCC=dietgcc;
-}
diff --git a/pkgs/tools/text/gnupatch-diet/default.nix b/pkgs/tools/text/gnupatch-diet/default.nix
deleted file mode 100644
index c16ae9c5510..00000000000
--- a/pkgs/tools/text/gnupatch-diet/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl, dietgcc}:
-
-stdenv.mkDerivation {
-  name = "gnupatch-2.5.4";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/patch-2.5.4.tar.gz;
-    md5 = "ee5ae84d115f051d87fcaaef3b4ae782";
-  };
-  NIX_GCC=dietgcc;
-}
diff --git a/pkgs/tools/text/gnused-diet/default.nix b/pkgs/tools/text/gnused-diet/default.nix
deleted file mode 100644
index c85d53adf08..00000000000
--- a/pkgs/tools/text/gnused-diet/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, dietgcc}:
-
-stdenv.mkDerivation {
-  name = "gnused-4.1.4";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/sed-4.1.4.tar.gz;
-    md5 = "2a62ceadcb571d2dac006f81df5ddb48";
-  };
-  NIX_GCC=dietgcc;
-  NIX_GLIBC_FLAGS_SET=1;
-  NIX_CFLAGS_COMPILE="-D_BSD_SOURCE=1";
-}