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
This commit is contained in:
@@ -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 ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user