treewide: stop using fontbhttf
This commit is contained in:
@@ -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 \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ runCommand, lib, writeText, fontconfig, fontbhttf, fontDirectories }:
|
||||
{ runCommand, lib, writeText, fontconfig, fontDirectories }:
|
||||
|
||||
runCommand "fc-cache"
|
||||
rec {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{ runCommand, libxslt, fontconfig, fontbhttf, fontDirectories }:
|
||||
{ runCommand, libxslt, fontconfig, dejavu_fonts, fontDirectories }:
|
||||
|
||||
runCommand "fonts.conf"
|
||||
{
|
||||
buildInputs = [ libxslt fontconfig ];
|
||||
# Add a default font for non-nixos systems. fontbhttf is only about 1mb.
|
||||
fontDirectories = fontDirectories ++ [ fontbhttf ];
|
||||
# Add a default font for non-nixos systems, <1MB and in nixos defaults.
|
||||
fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ];
|
||||
}
|
||||
''
|
||||
xsltproc --stringparam fontDirectories "$fontDirectories" \
|
||||
|
||||
Reference in New Issue
Block a user