diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2018-04-14 00:12:19 +0200 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2018-04-14 00:20:28 +0200 |
commit | e7b213d55e92307dc515eb61f227e1ed2a1f64a9 (patch) | |
tree | cbde7aaf24627ec59a0aa3e7c25845165fc66eb0 /pkgs/applications/office | |
parent | 35b07390d78218d58d4068b1c2550091627265e0 (diff) |
libreoffice-still, libreoffice-fresh: use fresh bluez, not the oldest ICU, comment about GCC version, use the fontconfig fix for libreoffice-still
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index d1e80724aaf36..b4139d54af509 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -2,7 +2,7 @@ , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, cups, xorg, libcmis +, icu, boost, jdk, ant, cups, xorg, libcmis, carlito , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr @@ -106,6 +106,11 @@ in stdenv.mkDerivation rec { # BLFS patch for Glibc 2.23 renaming isnan sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx + + # This is required as some cppunittests require fontconfig configured + cp "${fontsConf}" fonts.conf + sed -e '/include/i<include>${carlito}/etc/fonts/conf.d</include>' -i fonts.conf + export FONTCONFIG_FILE="$PWD/fonts.conf" ''; # fetch_Download_item tries to interpret the name as a variable name |