From 53d6a7b1ba71c711ad2798dc472518c934c270b6 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 7 Jan 2012 13:19:06 +0000 Subject: [PATCH] Openoffice.org does not build with libwpd 0.9. svn path=/nixpkgs/trunk/; revision=31396 --- pkgs/development/libraries/libwpd/0.8.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/libwpd/0.8.nix diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix new file mode 100644 index 000000000000..504bddb777a7 --- /dev/null +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -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 ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2da9fe27dfd..f38efd5161b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4162,6 +4162,10 @@ let 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 @@ let inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2; neon = neon029; + libwpd = libwpd_08; }; go_oo = callPackage ../applications/office/openoffice/go-oo.nix {