diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-30 13:57:20 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-09 12:44:49 +0200 |
| commit | f97ee61255478e9ca683d1fb7c9fd777247293cb (patch) | |
| tree | ead0fbc50c92bf1a9b6c6546335ca1c55d8fe427 /pkgs/tools/archivers/unzip | |
| parent | 3e33c975fb850e903feaac4925b8e267493a6205 (diff) | |
| download | nixpkgs-f97ee61255478e9ca683d1fb7c9fd777247293cb.tar nixpkgs-f97ee61255478e9ca683d1fb7c9fd777247293cb.tar.gz nixpkgs-f97ee61255478e9ca683d1fb7c9fd777247293cb.tar.bz2 nixpkgs-f97ee61255478e9ca683d1fb7c9fd777247293cb.tar.lz nixpkgs-f97ee61255478e9ca683d1fb7c9fd777247293cb.tar.xz nixpkgs-f97ee61255478e9ca683d1fb7c9fd777247293cb.tar.zst nixpkgs-f97ee61255478e9ca683d1fb7c9fd777247293cb.zip | |
unzip: Clean up expression
Diffstat (limited to 'pkgs/tools/archivers/unzip')
| -rw-r--r-- | pkgs/tools/archivers/unzip/default.nix | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index f939c968c44..0f8ddb17059 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -1,14 +1,21 @@ { stdenv, fetchurl, bzip2 , enableNLS ? false, libnatspec }: -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "unzip-6.0"; - + src = fetchurl { url = mirror://sourceforge/infozip/unzip60.tar.gz; sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"; }; + patches = stdenv.lib.optional enableNLS + (fetchurl { + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1"; + name = "unzip-6.0-natspec.patch"; + sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1"; + }); + nativeBuildInputs = [ bzip2 ]; buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec; @@ -30,13 +37,4 @@ stdenv.mkDerivation ({ license = "free"; # http://www.info-zip.org/license.html platforms = stdenv.lib.platforms.all; }; -} // (if enableNLS then { - patches = - [ ( fetchurl { - url = - "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1"; - name = "unzip-6.0-natspec.patch"; - sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1"; - }) - ]; -} else {})) +} |