public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disabling NLS for the zip at openoffice builders. I think it breaks the builds, based on

Browse Source 
the nixpkgs diff for the breakage at http://hydra.nixos.org/build/1964660 .


svn path=/nixpkgs/trunk/; revision=32556
This commit is contained in:
Lluís Batlle i Rossell 2012-02-25 15:54:57 +00:00
parent bfd787a69a
commit bfb0389d6c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/archivers/zip/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, libnatspec }: { stdenv, fetchurl, enableNLS ? true, libnatspec ? null }:
assert enableNLS -> libnatspec != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "zip-3.0"; name = "zip-3.0";
@ -12,9 +14,9 @@ stdenv.mkDerivation {
installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp"; 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 = { meta = {
homepage = http://www.info-zip.org; homepage = http://www.info-zip.org;
@ -22,4 +24,3 @@ stdenv.mkDerivation {
maintainer = [ stdenv.lib.maintainers.urkud ]; maintainer = [ stdenv.lib.maintainers.urkud ];
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -7272,6 +7272,7 @@ let
inherit (gnome) GConf ORBit2; inherit (gnome) GConf ORBit2;
neon = neon029; neon = neon029;
libwpd = libwpd_08; libwpd = libwpd_08;
zip = zip.override { enableNLS = false; };
}; };
go_oo = callPackage ../applications/office/openoffice/go-oo.nix { go_oo = callPackage ../applications/office/openoffice/go-oo.nix {
@ -7279,6 +7280,7 @@ let
inherit (gnome) GConf ORBit2; inherit (gnome) GConf ORBit2;
neon = neon029; neon = neon029;
libwpd = libwpd_08; libwpd = libwpd_08;
zip = zip.override { enableNLS = false; };
}; };
openscad = callPackage ../applications/graphics/openscad {}; openscad = callPackage ../applications/graphics/openscad {};