aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/libcdr
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/libcdr
parent004c745c52e6e6f5af5bff6331dad8d73d31af24 (diff)
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/libcdr')
-rw-r--r--pkgs/development/libraries/libcdr/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index 1da25527ef7e..23fafb44c81e 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig }:
+{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost }:
stdenv.mkDerivation rec {
- name = "libcdr-0.0.8";
+ name = "libcdr-0.1.0";
src = fetchurl {
- url = "http://dev-www.libreoffice.org/src/${name}.tar.xz";
- sha256 = "117a8gp29xs3kin6kaisb3frsx8dwrsjgs4wq4y5hjqprzy6lwz0";
+ url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2";
+ sha256 = "1l4glkyyxhzqq6j9n9cc01sf1q7xx8dd97cl3bwj8w4fp06ihv7g";
};
- buildInputs = [ libwpg libwpd lcms ];
+ buildInputs = [ libwpg libwpd lcms librevenge icu boost ];
nativeBuildInputs = [ pkgconfig ];