diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-02-25 15:54:57 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-02-25 15:54:57 +0000 |
| commit | bfb0389d6cf2caa6f017f11f9fd9a488713b89f9 (patch) | |
| tree | 09f9ad88e18b1e23a3d1f2f66500de090d8c14e5 /pkgs/tools/archivers/zip | |
| parent | bfd787a69a4bf8c2b170063f3b9416f0df24ddf9 (diff) | |
| download | nixlib-bfb0389d6cf2caa6f017f11f9fd9a488713b89f9.tar nixlib-bfb0389d6cf2caa6f017f11f9fd9a488713b89f9.tar.gz nixlib-bfb0389d6cf2caa6f017f11f9fd9a488713b89f9.tar.bz2 nixlib-bfb0389d6cf2caa6f017f11f9fd9a488713b89f9.tar.lz nixlib-bfb0389d6cf2caa6f017f11f9fd9a488713b89f9.tar.xz nixlib-bfb0389d6cf2caa6f017f11f9fd9a488713b89f9.tar.zst nixlib-bfb0389d6cf2caa6f017f11f9fd9a488713b89f9.zip | |
Disabling NLS for the zip at openoffice builders. I think it breaks the builds, based on
the nixpkgs diff for the breakage at http://hydra.nixos.org/build/1964660 . svn path=/nixpkgs/trunk/; revision=32556
Diffstat (limited to 'pkgs/tools/archivers/zip')
| -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 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 ]; }; } - |