JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unzip: Clean up expression

Browse Source
This commit is contained in:
Eelco Dolstra 2014-06-30 13:57:20 +02:00
parent 3e33c975fb
commit f97ee61255
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/tools/archivers/unzip/default.nix
View File

@ -1,14 +1,21 @@
{ stdenv, fetchurl, bzip2 { stdenv, fetchurl, bzip2
, enableNLS ? false, libnatspec }: , enableNLS ? false, libnatspec }:
stdenv.mkDerivation ({ stdenv.mkDerivation {
name = "unzip-6.0"; name = "unzip-6.0";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/infozip/unzip60.tar.gz; url = mirror://sourceforge/infozip/unzip60.tar.gz;
sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"; 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 ]; nativeBuildInputs = [ bzip2 ];
buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec; buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec;
@ -30,13 +37,4 @@ stdenv.mkDerivation ({
license = "free"; # http://www.info-zip.org/license.html license = "free"; # http://www.info-zip.org/license.html
platforms = stdenv.lib.platforms.all; 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 {}))