diff options
| author | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
| commit | ea195b2507b9068d966009d27c0e90b57d88f30d (patch) | |
| tree | 287b4453ffa21139715bb1c1c57e6d01d1045295 /pkgs/tools/archivers | |
| parent | 38e3d7bc86d2a48dd4d653fd3f142f422c075563 (diff) | |
| parent | 385f242a400749b3923d51fff5a86403e6dab0dc (diff) | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/zip/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index e3b48f4832546..c7bddfd6de2ca 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, libnatspec }: +{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null }: + +assert enableNLS -> libnatspec != null; stdenv.mkDerivation { name = "zip-3.0"; @@ -12,9 +14,9 @@ stdenv.mkDerivation { installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp"; - patches = [ ./natspec-gentoo.patch.bz2 ]; + patches = if enableNLS then [ ./natspec-gentoo.patch.bz2 ] else []; - buildInputs = [ libnatspec ]; + buildInputs = if enableNLS then [ libnatspec ] else []; meta = { homepage = http://www.info-zip.org; @@ -22,4 +24,3 @@ stdenv.mkDerivation { maintainer = [ stdenv.lib.maintainers.urkud ]; }; } - |