* Got rid of a lot of "postInstall=postInstall" and similar lines in

  builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276

28 files changed, 38 insertions, 89 deletions

diff --git a/pkgs/development/compilers/gcc-2.95/builder.sh b/pkgs/development/compilers/gcc-2.95/builder.sh
index cf12872f1c3..5244d986da0 100644
--- a/pkgs/development/compilers/gcc-2.95/builder.sh
+++ b/pkgs/development/compilers/gcc-2.95/builder.sh
@@ -47,7 +47,6 @@ else
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     
     # Determine the frontends to build.
diff --git a/pkgs/development/compilers/gcc-3.3/builder.sh b/pkgs/development/compilers/gcc-3.3/builder.sh
index 20973c2623b..5b80215cffb 100644
--- a/pkgs/development/compilers/gcc-3.3/builder.sh
+++ b/pkgs/development/compilers/gcc-3.3/builder.sh
@@ -38,8 +38,6 @@ EOF
     configureFlags="--enable-languages=$langs"
 }
 
-preConfigure=preConfigure
-
 
 postConfigure() {
     if test "$noSysDirs" = "1"; then
@@ -82,8 +80,6 @@ postConfigure() {
     fi
 }
 
-postConfigure=postConfigure
-
 
 buildFlags="bootstrap"
 
diff --git a/pkgs/development/compilers/gcc-3.4/builder.sh b/pkgs/development/compilers/gcc-3.4/builder.sh
index eb1f211dce8..5a43d600a50 100644
--- a/pkgs/development/compilers/gcc-3.4/builder.sh
+++ b/pkgs/development/compilers/gcc-3.4/builder.sh
@@ -35,7 +35,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -44,7 +43,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/gcc-4.0/builder.sh b/pkgs/development/compilers/gcc-4.0/builder.sh
index 5df3168027f..08622c1899e 100644
--- a/pkgs/development/compilers/gcc-4.0/builder.sh
+++ b/pkgs/development/compilers/gcc-4.0/builder.sh
@@ -54,7 +54,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -63,7 +62,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/gcc-4.1/builder.sh b/pkgs/development/compilers/gcc-4.1/builder.sh
index c17d0403702..f8abca12257 100644
--- a/pkgs/development/compilers/gcc-4.1/builder.sh
+++ b/pkgs/development/compilers/gcc-4.1/builder.sh
@@ -50,7 +50,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -59,7 +58,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/gcc-4.2/builder.sh b/pkgs/development/compilers/gcc-4.2/builder.sh
index ee11e974a40..d749fc08d2a 100644
--- a/pkgs/development/compilers/gcc-4.2/builder.sh
+++ b/pkgs/development/compilers/gcc-4.2/builder.sh
@@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -60,7 +59,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/gcc-4.3/builder.sh b/pkgs/development/compilers/gcc-4.3/builder.sh
index a6bbbd7a052..2bc011e3e6e 100644
--- a/pkgs/development/compilers/gcc-4.3/builder.sh
+++ b/pkgs/development/compilers/gcc-4.3/builder.sh
@@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -60,7 +59,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/gcc-apple/builder.sh b/pkgs/development/compilers/gcc-apple/builder.sh
index 8485b6efec0..a10813e5e33 100644
--- a/pkgs/development/compilers/gcc-apple/builder.sh
+++ b/pkgs/development/compilers/gcc-apple/builder.sh
@@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     
     # Determine the frontends to build.
@@ -72,7 +71,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/gcc-upc-4.0/builder.sh b/pkgs/development/compilers/gcc-upc-4.0/builder.sh
index 5df3168027f..08622c1899e 100644
--- a/pkgs/development/compilers/gcc-upc-4.0/builder.sh
+++ b/pkgs/development/compilers/gcc-upc-4.0/builder.sh
@@ -54,7 +54,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -63,7 +62,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/llvm/builder.sh b/pkgs/development/compilers/llvm/builder.sh
index 962e8d37238..fd44f6bf6a3 100644
--- a/pkgs/development/compilers/llvm/builder.sh
+++ b/pkgs/development/compilers/llvm/builder.sh
@@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -60,7 +59,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/interpreters/perl-5.8/builder.sh b/pkgs/development/interpreters/perl-5.8/builder.sh
index c393cb0560b..79458b3249b 100644
--- a/pkgs/development/interpreters/perl-5.8/builder.sh
+++ b/pkgs/development/interpreters/perl-5.8/builder.sh
@@ -9,13 +9,11 @@ configureScript=./Configure
 configureFlags="-de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl $extraflags"
 dontAddPrefix=1
 
-preBuild=preBuild
 preBuild() {
     # Make Cwd work on NixOS (where we don't have a /bin/pwd).
     substituteInPlace lib/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
 }
 
-postInstall=postInstall
 postInstall() {
     ensureDir "$out/nix-support"
     cp $setupHook $out/nix-support/setup-hook
diff --git a/pkgs/development/interpreters/python/2.4/default.nix b/pkgs/development/interpreters/python/2.4/default.nix
index 726d2ac4aa9..e64d0442d3f 100644
--- a/pkgs/development/interpreters/python/2.4/default.nix
+++ b/pkgs/development/interpreters/python/2.4/default.nix
@@ -32,18 +32,18 @@ stdenv.mkDerivation {
   
   configureFlags = "--enable-shared";
   
-  preConfigure = "
+  preConfigure = ''
     # Purity.
     for i in /usr /sw /opt /pkg; do 
       substituteInPlace ./setup.py --replace $i /no-such-path
     done
-  ";
+  '';
+
+  setupHook = ./setup-hook.sh;
   
-  postInstall = "
-    ensureDir $out/nix-support
-    cp ${./setup-hook.sh} $out/nix-support/setup-hook
+  postInstall = ''
     rm -rf $out/lib/python2.4/test
-  ";
+  '';
 
   passthru = {
     inherit zlibSupport;
diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix
index 7b009bbe0c0..a9e63557524 100644
--- a/pkgs/development/interpreters/python/2.5/default.nix
+++ b/pkgs/development/interpreters/python/2.5/default.nix
@@ -53,20 +53,20 @@ stdenv.mkDerivation {
   
   configureFlags = "--enable-shared --with-wctype-functions";
   
-  preConfigure = "
+  preConfigure = ''
     # Purity.
     for i in /usr /sw /opt /pkg; do 
       substituteInPlace ./setup.py --replace $i /no-such-path
     done
-  " + (if readline != null then ''
+  '' + (if readline != null then ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses"
   '' else "");
+
+  setupHook = ./setup-hook.sh;
   
-  postInstall = "
-    ensureDir $out/nix-support
-    cp ${./setup-hook.sh} $out/nix-support/setup-hook
+  postInstall = ''
     rm -rf $out/lib/python2.5/test
-  ";
+  '';
 
   passthru = {
     inherit zlibSupport;
diff --git a/pkgs/development/interpreters/tcl/builder.sh b/pkgs/development/interpreters/tcl/builder.sh
deleted file mode 100644
index 24d4853de5d..00000000000
--- a/pkgs/development/interpreters/tcl/builder.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-source $stdenv/setup
-
-preConfigure() {
-  cd unix
-}
-
-preConfigure=preConfigure
-
-postInstall() {
-        make install-private-headers
-	ln -s $out/bin/tclsh8.4 $out/bin/tclsh
-}
-
-postInstall=postInstall
-
-genericBuild
diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix
index 5f9a4f9f90f..7cc58b92145 100644
--- a/pkgs/development/interpreters/tcl/default.nix
+++ b/pkgs/development/interpreters/tcl/default.nix
@@ -2,11 +2,19 @@
 
 stdenv.mkDerivation {
   name = "tcl-8.4.18";
-  builder = ./builder.sh;
+
   src = fetchurl {
     url = mirror://sourceforge/tcl/tcl8.4.18-src.tar.gz;
     sha256 = "197h3m2lc5a6famc683zhjp55774gf8zwggfy2893v48lp5p7qny";
   };
+
+  preConfigure = "cd unix";
+
+  postInstall = ''
+    make install-private-headers
+    ln -s $out/bin/tclsh8.4 $out/bin/tclsh
+  '';
+  
   meta = {
     description = "The Tcl scription language";
     homepage = http://www.tcl.tk/;
diff --git a/pkgs/development/libraries/Xaw3d/builder.sh b/pkgs/development/libraries/Xaw3d/builder.sh
index bbe01704175..afd640b625d 100644
--- a/pkgs/development/libraries/Xaw3d/builder.sh
+++ b/pkgs/development/libraries/Xaw3d/builder.sh
@@ -1,13 +1,11 @@
 source $stdenv/setup
 
-configurePhase=configurePhase
 configurePhase() {
     cd lib/Xaw3d
     (mkdir X11 && cd X11 && ln -fs .. Xaw3d)
     xmkmf
 }
 
-buildPhase=buildPhase
 buildPhase() {
     make depend $makeFlags
     make $makeFlags
@@ -23,4 +21,4 @@ installPhase() {
 
 makeFlags="CDEBUGFLAGS=" # !!! awful hack
 
-genericBuild
\ No newline at end of file
+genericBuild
diff --git a/pkgs/development/libraries/cracklib/builder.sh b/pkgs/development/libraries/cracklib/builder.sh
index 0f7473a81b2..3833cc1e6c1 100644
--- a/pkgs/development/libraries/cracklib/builder.sh
+++ b/pkgs/development/libraries/cracklib/builder.sh
@@ -5,13 +5,9 @@ preConfigure() {
   cp $dicts cracklib-dicts/
 }
 
-preConfigure=preConfigure
-
 postInstall() {
   $out/sbin/cracklib-format cracklib-dicts/* | $out/sbin/cracklib-packer cracklib_dict
   cp cracklib_dict.* $out/lib
 }
 
-postInstall=postInstall
-
 genericBuild
diff --git a/pkgs/development/libraries/db4/builder.sh b/pkgs/development/libraries/db4/builder.sh
index d71bd806743..b9d48b60803 100644
--- a/pkgs/development/libraries/db4/builder.sh
+++ b/pkgs/development/libraries/db4/builder.sh
@@ -4,11 +4,9 @@ preConfigure() {
     cd build_unix
     configureScript=../dist/configure
 }
-preConfigure=preConfigure
 
 postInstall() {
     rm -rf $out/docs
 }
-postInstall=postInstall
 
 genericBuild
diff --git a/pkgs/development/libraries/db4/db4-4.4.nix b/pkgs/development/libraries/db4/db4-4.4.nix
index 4304cd8f9f3..7444439fc73 100644
--- a/pkgs/development/libraries/db4/db4-4.4.nix
+++ b/pkgs/development/libraries/db4/db4-4.4.nix
@@ -1,8 +1,10 @@
 {stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
 
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
   name = "db4-4.4.20";
+  
   builder = ./builder.sh;
+  
   src = fetchurl {
     urls = [
       http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz
@@ -10,8 +12,11 @@ stdenv.mkDerivation ({
     ];
     md5 = "afd9243ea353bbaa04421488d3b37900";
   };
+  
   configureFlags = [
     (if cxxSupport then "--enable-cxx" else "--disable-cxx")
     (if compat185 then "--enable-compat185" else "--disable-compat185")
   ];
-} // (if stdenv.system == "i686-cygwin" then {patches = [./cygwin-4.4.patch];} else {}))
+
+  patches = [ ./cygwin-4.4.patch ];
+}
diff --git a/pkgs/development/libraries/db4/db4-4.5.nix b/pkgs/development/libraries/db4/db4-4.5.nix
index c67deaeda45..e5cf6f35a01 100644
--- a/pkgs/development/libraries/db4/db4-4.5.nix
+++ b/pkgs/development/libraries/db4/db4-4.5.nix
@@ -2,14 +2,18 @@
 
 stdenv.mkDerivation {
   name = "db4-4.5.20";
+  
   builder = ./builder.sh;
+  
   src = fetchurl {
     url = http://download-east.oracle.com/berkeley-db/db-4.5.20.tar.gz;
     md5 = "b0f1c777708cb8e9d37fb47e7ed3312d";
   };
+  
   configureFlags = [
     (if cxxSupport then "--enable-cxx" else "--disable-cxx")
     (if compat185 then "--enable-compat185" else "--disable-compat185")
   ];
+  
   patches = [./cygwin-4.5.patch ./register-race-fix.patch];
 }
diff --git a/pkgs/development/libraries/glibc-2.5/builder.sh b/pkgs/development/libraries/glibc-2.5/builder.sh
index 8d5d6908f04..19ed717de3b 100644
--- a/pkgs/development/libraries/glibc-2.5/builder.sh
+++ b/pkgs/development/libraries/glibc-2.5/builder.sh
@@ -8,7 +8,6 @@ source $stdenv/setup
 export PWD_P=$(type -tP pwd)
 
 
-postUnpack=postUnpack
 postUnpack() {
     cd $sourceRoot
     unpackFile $linuxthreadsSrc
@@ -16,7 +15,6 @@ postUnpack() {
 }
 
 
-preConfigure=preConfigure
 preConfigure() {
 
     # Use Linuxthreads instead of NPTL.
@@ -34,7 +32,6 @@ preConfigure() {
 }
 
 
-postConfigure=postConfigure
 postConfigure() {
     # Hack: get rid of the `-static' flag set by the bootstrap stdenv.
     # This has to be done *after* `configure' because it builds some
@@ -44,7 +41,6 @@ postConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     if test -n "$installLocales"; then
         make localedata/install-locales
diff --git a/pkgs/development/libraries/glibc-2.7/builder.sh b/pkgs/development/libraries/glibc-2.7/builder.sh
index 1bf806c0149..d5a43229bfa 100644
--- a/pkgs/development/libraries/glibc-2.7/builder.sh
+++ b/pkgs/development/libraries/glibc-2.7/builder.sh
@@ -11,7 +11,6 @@ export PWD_P=$(type -tP pwd)
 export BASH_SHELL=$SHELL
 
 
-preConfigure=preConfigure
 preConfigure() {
 
     for i in configure io/ftwtest-sh; do
@@ -34,7 +33,6 @@ preConfigure() {
 }
 
 
-postConfigure=postConfigure
 postConfigure() {
     # Hack: get rid of the `-static' flag set by the bootstrap stdenv.
     # This has to be done *after* `configure' because it builds some
@@ -44,7 +42,6 @@ postConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     if test -n "$installLocales"; then
         make localedata/install-locales
diff --git a/pkgs/development/libraries/libjpeg/builder.sh b/pkgs/development/libraries/libjpeg/builder.sh
index b5662f7eb67..923f4f83974 100644
--- a/pkgs/development/libraries/libjpeg/builder.sh
+++ b/pkgs/development/libraries/libjpeg/builder.sh
@@ -1,6 +1,5 @@
 source $stdenv/setup
 
-preConfigure=preConfigure
 preConfigure() {
     # Workarounds for the ancient libtool shipped by libjpeg.
     ln -s $libtool/bin/libtool .
@@ -8,7 +7,6 @@ preConfigure() {
     cp $libtool/share/libtool/config.sub .
 }
 
-preInstall=preInstall
 preInstall() {
     mkdir $out
     mkdir $out/bin
@@ -18,7 +16,6 @@ preInstall() {
     mkdir $out/man/man1
 }
 
-patchPhase=patchPhase
 patchPhase() {
     for i in $patches; do
 	patch < $i
diff --git a/pkgs/development/libraries/qt-3/builder.sh b/pkgs/development/libraries/qt-3/builder.sh
index b403f036b0e..460ae17766a 100644
--- a/pkgs/development/libraries/qt-3/builder.sh
+++ b/pkgs/development/libraries/qt-3/builder.sh
@@ -1,10 +1,6 @@
 source $stdenv/setup
 
-ensureDir $out/nix-support
-substitute "$hook" "$out/nix-support/setup-hook" --subst-var out
 
-
-preConfigure=preConfigure
 preConfigure() {
 
     # Patch some of the configure files a bit to get of global paths.
@@ -30,7 +26,6 @@ configureScript() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Qt's `make install' is broken; it copies ./bin/qmake, which
     # is a symlink to ./qmake/qmake.  So we end up with a dangling
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index e26c9072076..e1bc3f89741 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -21,7 +21,9 @@ stdenv.mkDerivation {
   name = "qt-3.3.8";
 
   builder = ./builder.sh;
-  hook = ./setup-hook.sh;  
+
+  setupHook = ./setup-hook.sh;
+
   src = fetchurl {
     url = ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8.tar.bz2;
     sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";
diff --git a/pkgs/development/python-modules/pysqlite/builder.sh b/pkgs/development/python-modules/pysqlite/builder.sh
index e1ca0e4a8fc..04027c22971 100644
--- a/pkgs/development/python-modules/pysqlite/builder.sh
+++ b/pkgs/development/python-modules/pysqlite/builder.sh
@@ -6,16 +6,13 @@ configurePhase() {
 		--replace "/usr/local/lib" "$sqlite/lib"
 	cp setup.cfg /tmp
 }
-configurePhase=configurePhase
 
 buildPhase() {
 	$python/bin/python setup.py build
 }
-buildPhase=buildPhase
 
 installPhase() {
 	$python/bin/python setup.py install --prefix=$out
 }
-installPhase=installPhase
 
 genericBuild
diff --git a/pkgs/development/python-modules/wxPython/builder.sh b/pkgs/development/python-modules/wxPython/builder.sh
index e4dce866c67..ed7177081f9 100644
--- a/pkgs/development/python-modules/wxPython/builder.sh
+++ b/pkgs/development/python-modules/wxPython/builder.sh
@@ -5,16 +5,13 @@ flags="WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=0 BUILD_OGL=0 UNICODE=1"
 configurePhase() {
     cd wxPython
 }
-configurePhase=configurePhase
 
 buildPhase() {
     python setup.py $flags build
 }
-buildPhase=buildPhase
 
 installPhase() {
     python setup.py $flags install --prefix=$out
 }
-installPhase=installPhase
 
-genericBuild
\ No newline at end of file
+genericBuild
diff --git a/pkgs/development/tools/parsing/jikespg/builder.sh b/pkgs/development/tools/parsing/jikespg/builder.sh
index 42fe7fdd624..090def7c464 100644
--- a/pkgs/development/tools/parsing/jikespg/builder.sh
+++ b/pkgs/development/tools/parsing/jikespg/builder.sh
@@ -2,16 +2,14 @@ source $stdenv/setup
 
 set -e
 
-configurePhase=configurePhase
 configurePhase() {
   tar zxvf $src 
   cd jikespg/src
 }
 
-installPhase=installPhase
 installPhase() {
   ensureDir $out/bin
   cp jikespg $out/bin
 }
 
-genericBuild
\ No newline at end of file
+genericBuild