* Add patch, sed.

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

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)
-      ["bash" "bzip2" "coreutils" "gnutar" "patchelf"];
+      ["coreutils" "gnused" "gnutar" "bzip2" "bash" "patch" "patchelf"];
   };
 
   generator = pkgs.stdenv.mkDerivation {
     name = "bootstrap-tools-generator";
     builder = ./make-bootstrap-tools.sh;
-    inherit (pkgsDiet) bash bzip2 coreutils gnutar;
+    inherit (pkgsDiet) coreutils gnused gnutar bzip2 bash patch;
     curl = pkgsDiet.realCurl;
 
     # The result should not contain any references (store paths) so

pkgs/stdenv/linux/make-bootstrap-tools.sh

@@ -26,13 +26,6 @@ bzip2 < $curl/bin/curl > $out/in-nixpkgs/curl.bz2
 nukeRefs $out/in-nixpkgs/bash
 nukeRefs $out/in-nixpkgs/tar
 
-for i in $out/in-nixpkgs/*; do
-    if test -x $i; then
-        chmod +w $i
-        strip -s $i
-    fi
-done
-
 
 mkdir tools
 mkdir tools/bin
@@ -41,7 +34,25 @@ cp $coreutils/bin/* tools/bin
 rm tools/bin/groups # has references
 rm tools/bin/printf # idem
 
+cp $gnused/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
+
 #cp $patchelf/bin/* tools/bin
+
+
+for i in $out/in-nixpkgs/* tools/bin/*; do
+    if test -x $i; then
+        chmod +w $i
+        strip -s $i
+    fi
+done
+
+
 tar cvfj $out/on-server/static-tools.tar.bz2 tools
 
 

pkgs/tools/text/gnupatch/default.nix

@@ -9,4 +9,11 @@
   (if stdenv.system != "i686-linux" then {
     patches = [./setmode.patch];
     configureFlags = "dummy"; # doesn't build on Darwin unless a platform is specified
-  } else {}))
+  } else {})
+  // 
+  # !!! hack
+  (if stdenv ? isDietLibC then {
+    # !!! pass this on all platforms
+    configureFlags = "dummy"; # doesn't build unless a platform is specified
+  } else {})
+)