* 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

1 files changed, 6 insertions, 2 deletions

diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index 9e17e2d9edd..c72def3731a 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -2,13 +2,17 @@
 
 stdenv.mkDerivation {
   name = "unzip-5.52";
-  builder = ./builder.sh;
+  
   src = fetchurl {
     url = http://nixos.org/tarballs/unzip552.tar.gz;
     md5 = "9d23919999d6eac9217d1f41472034a9";
   };
 
+  buildPhase = "make -f unix/Makefile generic";
+
+  installPhase = "make -f unix/Makefile prefix=$out install";
+
   meta = {
-	  homepage = http://www.info-zip.org;
+    homepage = http://www.info-zip.org;
   };
 }