From 6a34912bfb572403c816601332fba9d05bc263e0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:10:36 +0000
Subject: [PATCH] zip: Folded builder into derivation

svn path=/nixpkgs/trunk/; revision=28047
---
 pkgs/tools/archivers/zip/builder.sh  | 7 -------
 pkgs/tools/archivers/zip/default.nix | 5 ++++-
 2 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 pkgs/tools/archivers/zip/builder.sh

diff --git a/pkgs/tools/archivers/zip/builder.sh b/pkgs/tools/archivers/zip/builder.sh
deleted file mode 100644
index da58762b434..00000000000
--- a/pkgs/tools/archivers/zip/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-buildFlags="-f unix/Makefile generic"
-
-installFlags="-f unix/Makefile prefix=$out INSTALL=cp"
-
-genericBuild
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 9498bf089ff..7d78d6e41fd 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -1,11 +1,14 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "zip-2.32";
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.info-zip.org/pub/infozip/src/zip232.tgz;
     md5 = "8a4da4460386e324debe97f3b7fe4d96";
   };
 
+  buildFlags="-f unix/Makefile generic";
+
+  installFlags="-f unix/Makefile prefix=$out INSTALL=cp";
+
   meta = {
     homepage = http://www.info-zip.org;
   };