diff options
| -rw-r--r-- | pkgs/tools/archivers/zip/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index e3b48f483254..c7bddfd6de2c 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 ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b4cf34d9483..99fb330bec37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7272,6 +7272,7 @@ let inherit (gnome) GConf ORBit2; neon = neon029; libwpd = libwpd_08; + zip = zip.override { enableNLS = false; }; }; go_oo = callPackage ../applications/office/openoffice/go-oo.nix { @@ -7279,6 +7280,7 @@ let inherit (gnome) GConf ORBit2; neon = neon029; libwpd = libwpd_08; + zip = zip.override { enableNLS = false; }; }; openscad = callPackage ../applications/graphics/openscad {}; |