Author: kkallio
Date: Sat Jan 7 13:19:06 2012
New Revision: 31396
URL: https://nixos.org/websvn/nix/?rev=31396&sc=1
Log:
Openoffice.org does not build with libwpd 0.9.
Added:
nixpkgs/trunk/pkgs/development/libraries/libwpd/0.8.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/libwpd/0.8.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/libwpd/0.8.nix Sat Jan 7
13:19:06 2012 (r31396)
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }:
+
+stdenv.mkDerivation rec {
+ name = "libwpd-0.8.14";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/libwpd/${name}.tar.gz";
+ sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
+ };
+
+ buildInputs = [ glib libgsf libxml2 ];
+
+ buildNativeInputs = [ pkgconfig bzip2 ];
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 7 10:19:39
2012 (r31395)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 7 13:19:06
2012 (r31396)
@@ -4162,6 +4162,10 @@
inherit (gnome) glib;
};
+ libwpd_08 = callPackage ../development/libraries/libwpd/0.8.nix {
+ inherit (gnome) glib;
+ };
+
libwpg = callPackage ../development/libraries/libwpg { };
libx86 = builderDefsPackage ../development/libraries/libx86 {};
@@ -7197,6 +7201,7 @@
inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2;
neon = neon029;
+ libwpd = libwpd_08;
};
go_oo = callPackage ../applications/office/openoffice/go-oo.nix {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
