Making libreoffice have a configured fontconfig. I hope this will make some cppunit tests work, and thus we would not need to disable them.

I update the patch that disables tests with one more test disabled, but I don't
use it because I hope the build with fonts.conf will work fine. If that is the case,
I'll remove the patch file later. If the fonts.conf trick does not work, I may want
to extend the patch to disable all failing cases.


svn path=/nixpkgs/trunk/; revision=33062

pkgs/applications/office/openoffice/disable-uimpress-test.patch

@@ -18,3 +18,16 @@ index 4fd3a95..10fa388 100644
  # disabled for now, seems to have incomplete deps and hangs on a build from scratch
  #    CppunitTest_sd_filters_test \
  
+diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
+index 9c8696b..b36535b 100644
+--- a/sc/Module_sc.mk
++++ b/sc/Module_sc.mk
+@@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,sc,\
+ ))
+ 
+ $(eval $(call gb_Module_add_check_targets,sc,\
+-    CppunitTest_sc_filters_test \
++#    CppunitTest_sc_filters_test \
+     CppunitTest_sc_ucalc \
+ ))
+ 

pkgs/applications/office/openoffice/libreoffice.nix

@@ -6,6 +6,7 @@
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, gstreamer, gstPluginsBase, mesa
 , autoconf, automake, openldap, bash
+, fontsConf
 , langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
 }:
 
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
 
   configureScript = "./autogen.sh";
 
-  patches = [ ./disable-uimpress-test.patch ];
+  # patches = [ ./disable-uimpress-test.patch ];
 
   preConfigure = ''
     tar xf $src_translation
@@ -50,6 +51,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildPhase = ''
+    export FONTCONFIG_FILE=${fontsConf}
     mkdir src
     for a in $srcs_download; do
       FILE=$(basename $a)

pkgs/top-level/all-packages.nix

@@ -6983,12 +6983,14 @@ let
   librecad = callPackage ../applications/misc/librecad { };
 
   libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix {
-    # gnumake381 works much faster than 3.82, but does not allow multiprocess builds
-    stdenv = overrideInStdenv stdenv [ gnumake381 ];
-
     inherit (perlPackages) ArchiveZip CompressZlib;
     inherit (gnome) GConf ORBit2 gnome_vfs;
     inherit (gst_all) gstreamer gstPluginsBase;
+    fontsConf = makeFontsConf {
+      fontDirectories = [
+        freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
+      ];
+    };
   };
 
   lingot = callPackage ../applications/audio/lingot {