* 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

2 files changed, 9 insertions, 17 deletions

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/;