dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

libreoffice-still, libreoffice-fresh: use fresh bluez, not the oldest ICU, comment about GCC version, use the fontconfig fix for libreoffice-still

Browse Source
This commit is contained in:
Michael Raskin 2018-04-14 00:12:19 +02:00
parent 35b07390d7
commit e7b213d55e
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/office/libreoffice/still.nix
View File

@ -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

8
pkgs/top-level/all-packages.nix
View File

@ -16503,7 +16503,6 @@ with pkgs;
inherit (gnome2) GConf ORBit2 gnome_vfs;
inherit (gnome3) defaultIconTheme;
zip = zip.override { enableNLS = false; };
bluez5 = bluez5_28;
fontsConf = makeFontsConf {
fontDirectories = [
carlito dejavu_fonts
@ -16518,6 +16517,7 @@ with pkgs;
withIcu = true; withGraphite2 = true;
};
# checking whether g++ supports C++14 or C++11... configure: error: no
# Still relevant: 2018-04-13
stdenv = overrideCC stdenv gcc5;
};});
@ -16527,11 +16527,13 @@ with pkgs;
inherit (gnome2) GConf ORBit2 gnome_vfs;
inherit (gnome3) defaultIconTheme;
zip = zip.override { enableNLS = false; };
bluez5 = bluez5_28;
poppler = poppler_0_61;
fontsConf = makeFontsConf {
fontDirectories = [
carlito dejavu_fonts
freefont_ttf xorg.fontmiscmisc
liberation_ttf_v1_binary
liberation_ttf_v2_binary
];
};
clucene_core = clucene_core_2;
@ -16539,8 +16541,8 @@ with pkgs;
harfbuzz = harfbuzz.override {
withIcu = true; withGraphite2 = true;
};
icu = icu58;
# checking whether g++ supports C++14 or C++11... configure: error: no
# Still relevant: 2018-04-13; gcc6 is not enough!
stdenv = overrideCC stdenv gcc5;
};});