Author: viric Date: Sat Feb 25 15:54:57 2012 New Revision: 32556 URL: https://nixos.org/websvn/nix/?rev=32556&sc=1
Log: 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 . Modified: nixpkgs/trunk/pkgs/tools/archivers/zip/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Modified: nixpkgs/trunk/pkgs/tools/archivers/zip/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/tools/archivers/zip/default.nix Sat Feb 25 03:09:36 2012 (r32555) +++ nixpkgs/trunk/pkgs/tools/archivers/zip/default.nix Sat Feb 25 15:54:57 2012 (r32556) @@ -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 @@ 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 @@ maintainer = [ stdenv.lib.maintainers.urkud ]; }; } - Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Feb 25 03:09:36 2012 (r32555) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Feb 25 15:54:57 2012 (r32556) @@ -7272,6 +7272,7 @@ 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 @@ inherit (gnome) GConf ORBit2; neon = neon029; libwpd = libwpd_08; + zip = zip.override { enableNLS = false; }; }; openscad = callPackage ../applications/graphics/openscad {}; _______________________________________________ nix-commits mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-commits
