diff options
| author | Shea Levy <shea@shealevy.com> | 2011-08-01 01:10:36 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-08-01 01:10:36 +0000 |
| commit | 6a34912bfb572403c816601332fba9d05bc263e0 (patch) | |
| tree | da6337a633ddcc75cee600231b8122091f287037 /pkgs/tools/archivers/zip | |
| parent | 38c1179f56602cff1ea648aeb9e5465d32ff3610 (diff) | |
| download | nixlib-6a34912bfb572403c816601332fba9d05bc263e0.tar nixlib-6a34912bfb572403c816601332fba9d05bc263e0.tar.gz nixlib-6a34912bfb572403c816601332fba9d05bc263e0.tar.bz2 nixlib-6a34912bfb572403c816601332fba9d05bc263e0.tar.lz nixlib-6a34912bfb572403c816601332fba9d05bc263e0.tar.xz nixlib-6a34912bfb572403c816601332fba9d05bc263e0.tar.zst nixlib-6a34912bfb572403c816601332fba9d05bc263e0.zip | |
zip: Folded builder into derivation
svn path=/nixpkgs/trunk/; revision=28047
Diffstat (limited to 'pkgs/tools/archivers/zip')
| -rw-r--r-- | pkgs/tools/archivers/zip/builder.sh | 7 | ||||
| -rw-r--r-- | pkgs/tools/archivers/zip/default.nix | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/tools/archivers/zip/builder.sh b/pkgs/tools/archivers/zip/builder.sh deleted file mode 100644 index da58762b4342..000000000000 --- 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 9498bf089ff2..7d78d6e41fda 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; }; |