summary refs log tree commit diff
path: root/pkgs/development/libraries/libwpg
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2014-08-12 01:39:48 +0400
committerMichael Raskin <7c6f434c@mail.ru>2014-08-12 01:49:54 +0400
commitd06eef88c9b8ea9b15d6a9674b9a82a0d17a3366 (patch)
tree7f7d3618639204e393fac079dc7f61d38fe65053 /pkgs/development/libraries/libwpg
parent004c745c52e6e6f5af5bff6331dad8d73d31af24 (diff)
downloadnixpkgs-d06eef88c9b8ea9b15d6a9674b9a82a0d17a3366.tar
nixpkgs-d06eef88c9b8ea9b15d6a9674b9a82a0d17a3366.tar.gz
nixpkgs-d06eef88c9b8ea9b15d6a9674b9a82a0d17a3366.tar.bz2
nixpkgs-d06eef88c9b8ea9b15d6a9674b9a82a0d17a3366.tar.lz
nixpkgs-d06eef88c9b8ea9b15d6a9674b9a82a0d17a3366.tar.xz
nixpkgs-d06eef88c9b8ea9b15d6a9674b9a82a0d17a3366.tar.zst
nixpkgs-d06eef88c9b8ea9b15d6a9674b9a82a0d17a3366.zip
Update libreoffice to the version 4.3.0.4
Also update its dependencies.

Update libcdr to 0.1.0
Update libmwaw to 0.3.2 from 0.3.1
Update libvisio to 0.1.0
Update libwpd to 0.10.0
Update libwpg to 0.3.0

These updates are require by LO update and also require each other.

Note that many of these libraries now require librevenge.

In LibreOffice expression per se:

- Note that liborcus is built separately because it wants Boost to be
  specified in a way that main LO build doesn't ensure.

- libixion from 0.7.0 tarball has libixion-0.8 package version.

- libgltf is in src/libgltf but listed in download.lst without any
  comments.

- Make variable with the name libreoffice-translations-${version}.tar.xz
  and the same value is inserted; the same for -help-. Fetching gives
  a strange error without that. Apparently everyone just builds git
  checkouts.

- There are some conditionals in download.lst that require manual
  handling. I am not sure there is a simple way to process them in
  generate-libreoffice-srcs.sh.
Diffstat (limited to 'pkgs/development/libraries/libwpg')
-rw-r--r--pkgs/development/libraries/libwpg/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index f71cc965472..0cb405d4837 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, libwpd, zlib }:
+{ stdenv, fetchurl, pkgconfig, libwpd, zlib, librevenge }:
 
 stdenv.mkDerivation rec {
-  name = "libwpg-0.2.2";
+  name = "libwpg-0.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/libwpg/${name}.tar.xz";
-    sha256 = "1kd6d583s9162z023gh5jqrhkjsdig2bsfylw3g38xa4p5vzv6xl";
+    sha256 = "097jx8a638fwwfrzf6v29r1yhc34rq9526py7wf0ck2z4fcr2w3g";
   };
 
-  buildInputs = [ libwpd zlib ];
+  buildInputs = [ libwpd zlib librevenge ];
   nativeBuildInputs = [ pkgconfig ];
 
   meta = {