diff options
author | Aluísio Augusto Silva Gonçalves <aluisio@aasg.name> | 2019-08-08 11:45:36 -0300 |
---|---|---|
committer | Aluísio Augusto Silva Gonçalves <aluisio@aasg.name> | 2019-08-17 10:35:39 -0300 |
commit | b90c63f50df94b37b46f9757ff4477a8875e22fb (patch) | |
tree | 6e1b52729f699805a498cb0fa65163c70c152d14 /pkgs/applications/office/libreoffice/default.nix | |
parent | 21a9aa0fcc83871ef5dbc481e8bab58667a8b5ed (diff) | |
download | nixlib-b90c63f50df94b37b46f9757ff4477a8875e22fb.tar nixlib-b90c63f50df94b37b46f9757ff4477a8875e22fb.tar.gz nixlib-b90c63f50df94b37b46f9757ff4477a8875e22fb.tar.bz2 nixlib-b90c63f50df94b37b46f9757ff4477a8875e22fb.tar.lz nixlib-b90c63f50df94b37b46f9757ff4477a8875e22fb.tar.xz nixlib-b90c63f50df94b37b46f9757ff4477a8875e22fb.tar.zst nixlib-b90c63f50df94b37b46f9757ff4477a8875e22fb.zip |
libreoffice-fresh: 6.2.4.2 -> 6.3.0.4
Diffstat (limited to 'pkgs/applications/office/libreoffice/default.nix')
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a82999366627..fe33d72a2167 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0ahyrkg1sa4a0igvvd98spjlm5k34cddpwpxl7qhir8ldgighk2c"; + sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0zrfm8kw6m60wz6mn4y5jhlng90ya045nxyh46sib9nl4nd4d98s"; + sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z"; }; }; @@ -144,6 +144,8 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx # tilde expansion in path processing checks the existence of $HOME sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx + # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 + sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' # rendering-dependent: on my computer the test table actually doesn't fit… # interesting fact: test disabled on macOS by upstream sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx @@ -306,6 +308,9 @@ in stdenv.mkDerivation rec { # Without these, configure does not finish "--without-junit" + # Schema files for validation are not included in the source tarball + "--without-export-validation" + "--disable-libnumbertext" # system-libnumbertext" # We do tarball prefetching ourselves |