about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2015-08-08 16:18:38 +0300
committerMichael Raskin <7c6f434c@mail.ru>2015-08-08 16:24:44 +0300
commitdb9679259a92dc77d86ee52288114e3b0ecd1362 (patch)
tree93fc6d76e871df292308099e7ba84514d4983eec /pkgs/applications
parent93dc62187b2d484852d57fe4cf2771876ca573bd (diff)
downloadnixlib-db9679259a92dc77d86ee52288114e3b0ecd1362.tar
nixlib-db9679259a92dc77d86ee52288114e3b0ecd1362.tar.gz
nixlib-db9679259a92dc77d86ee52288114e3b0ecd1362.tar.bz2
nixlib-db9679259a92dc77d86ee52288114e3b0ecd1362.tar.lz
nixlib-db9679259a92dc77d86ee52288114e3b0ecd1362.tar.xz
nixlib-db9679259a92dc77d86ee52288114e3b0ecd1362.tar.zst
nixlib-db9679259a92dc77d86ee52288114e3b0ecd1362.zip
LibreOffice: Kill one failing test which is fragile elsewhere, too
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/office/libreoffice/default.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 5c2772ea3035..d603bf86537c 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -17,6 +17,7 @@
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
+, gdb
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ]
 }:
 
@@ -148,6 +149,11 @@ stdenv.mkDerivation rec {
   postConfigure = ''
     sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
     sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
+
+    # unit test sd_tiledrendering seems to be fragile
+    # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
+    echo > ./sd/CppunitTest_sd_tiledrendering.mk
+    sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
   '';
 
   makeFlags = "SHELL=${bash}/bin/bash";
@@ -255,10 +261,10 @@ stdenv.mkDerivation rec {
       gst_all_1.gst-plugins-base
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
       python3 sablotron saneBackends tcsh unzip vigra which zip zlib
-      mdds bluez5 glibc /*libixion*/
+      mdds bluez5 glibc
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew
-      /*liborcus*/ libodfgen
+      libodfgen
     ];
 
   meta = with stdenv.lib; {