From bfb0389d6cf2caa6f017f11f9fd9a488713b89f9 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Sat, 25 Feb 2012 15:54:57 +0000 Subject: 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 --- pkgs/tools/archivers/zip/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/archivers/zip') 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 ]; }; } - -- cgit 1.4.1