* Merge the new generic builder.

* Removed substitute, it's part of the generic builder now.
* stdenv-initial (Linux): use the real generic builder script.  This
  does require that sed is in the path of the builder of the initial
  stdenv.

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

pkgs/development/libraries/glibc/default.nix

@@ -6,7 +6,6 @@
 stdenv.mkDerivation {
   name = "glibc-2.5";
   builder = ./builder.sh;
-  substitute = ../../../build-support/substitute/substitute.sh;
 
   src = fetchurl {
     url = http://ftp.gnu.org/gnu/glibc/glibc-2.5.tar.bz2;