* 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

4 files changed, 2 insertions, 5 deletions

diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh
index c8dc3aa25a5..f8726fd31d2 100644
--- a/pkgs/development/libraries/glibc/builder.sh
+++ b/pkgs/development/libraries/glibc/builder.sh
@@ -3,7 +3,6 @@ export NIX_NO_SELF_RPATH=1
 export NIX_DONT_SET_RPATH=1
 
 source $stdenv/setup
-source $substitute
 
 # Explicitly tell glibc to use our pwd, not /bin/pwd.
 export PWD_P=$(type -tP pwd)
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index d1b57e02c52..086747e9dcc 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/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;
diff --git a/pkgs/development/libraries/pysqlite/builder.sh b/pkgs/development/libraries/pysqlite/builder.sh
index aab781eb55c..e1ca0e4a8fc 100644
--- a/pkgs/development/libraries/pysqlite/builder.sh
+++ b/pkgs/development/libraries/pysqlite/builder.sh
@@ -1,5 +1,4 @@
 source $stdenv/setup
-source $substitute
 
 configurePhase() {
 	substituteInPlace "setup.cfg" \
diff --git a/pkgs/development/libraries/pysqlite/default.nix b/pkgs/development/libraries/pysqlite/default.nix
index 2671e7a08c5..1a3e8c05dc3 100644
--- a/pkgs/development/libraries/pysqlite/default.nix
+++ b/pkgs/development/libraries/pysqlite/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python, sqlite, substitute}:
+{stdenv, fetchurl, python, sqlite}:
 
 stdenv.mkDerivation {
   name = "pysqlite-2.2.2";
@@ -8,5 +8,5 @@ stdenv.mkDerivation {
   };
   builder = ./builder.sh;
 
-  inherit stdenv python sqlite substitute;
+  inherit stdenv python sqlite;
 }