* 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

5 files changed, 21 insertions, 31 deletions

diff --git a/pkgs/development/interpreters/perl-5.8/builder.sh b/pkgs/development/interpreters/perl-5.8/builder.sh
index c393cb0560b1..79458b3249b6 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 726d2ac4aa96..e64d0442d3fc 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 7b009bbe0c0a..a9e63557524c 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 24d4853de5d5..000000000000
--- 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 5f9a4f9f90fa..7cc58b92145c 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/;