treewide: stop using fontbhttf

This commit is contained in:
Vladimír Čunát
2016-08-29 22:28:50 +02:00
parent 3f80ecfc79
commit 4f73633f26
6 changed files with 12 additions and 13 deletions
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, fontbhttf
{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, dejavu_fonts
, substituteAll }:
/** Font configuration scheme
@@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/
"--disable-docs"
# just ~1MB; this is what you get when loading config fails for some reason
"--with-default-fonts=${fontbhttf}"
# just <1MB; this is what you get when loading config fails for some reason
"--with-default-fonts=${dejavu_fonts.minimal}"
];
# We should find a better way to access the arch reliably.
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
postInstall = ''
cd "$out/etc/fonts"
"${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \
"${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${dejavu_fonts.minimal}" \
--stringparam fontconfigConfigVersion "${configVersion}" \
--path $out/share/xml/fontconfig \
${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \