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

View File

@ -22,7 +22,7 @@ with lib;
config = { config = {
fonts.fonts = fonts.fonts =
[ pkgs.xorg.fontbhttf [
pkgs.xorg.fontbhlucidatypewriter100dpi pkgs.xorg.fontbhlucidatypewriter100dpi
pkgs.xorg.fontbhlucidatypewriter75dpi pkgs.xorg.fontbhlucidatypewriter75dpi
pkgs.dejavu_fonts pkgs.dejavu_fonts

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, fontbhttf { stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, dejavu_fonts
, substituteAll }: , substituteAll }:
/** Font configuration scheme /** Font configuration scheme
@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/ "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/
"--disable-docs" "--disable-docs"
# just ~1MB; this is what you get when loading config fails for some reason # just <1MB; this is what you get when loading config fails for some reason
"--with-default-fonts=${fontbhttf}" "--with-default-fonts=${dejavu_fonts.minimal}"
]; ];
# We should find a better way to access the arch reliably. # We should find a better way to access the arch reliably.
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
cd "$out/etc/fonts" cd "$out/etc/fonts"
"${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \ "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${dejavu_fonts.minimal}" \
--stringparam fontconfigConfigVersion "${configVersion}" \ --stringparam fontconfigConfigVersion "${configVersion}" \
--path $out/share/xml/fontconfig \ --path $out/share/xml/fontconfig \
${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \ ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \

View File

@ -1,4 +1,4 @@
{ runCommand, lib, writeText, fontconfig, fontbhttf, fontDirectories }: { runCommand, lib, writeText, fontconfig, fontDirectories }:
runCommand "fc-cache" runCommand "fc-cache"
rec { rec {

View File

@ -1,10 +1,10 @@
{ runCommand, libxslt, fontconfig, fontbhttf, fontDirectories }: { runCommand, libxslt, fontconfig, dejavu_fonts, fontDirectories }:
runCommand "fonts.conf" runCommand "fonts.conf"
{ {
buildInputs = [ libxslt fontconfig ]; buildInputs = [ libxslt fontconfig ];
# Add a default font for non-nixos systems. fontbhttf is only about 1mb. # Add a default font for non-nixos systems, <1MB and in nixos defaults.
fontDirectories = fontDirectories ++ [ fontbhttf ]; fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ];
} }
'' ''
xsltproc --stringparam fontDirectories "$fontDirectories" \ xsltproc --stringparam fontDirectories "$fontDirectories" \

View File

@ -60,7 +60,6 @@ let
sudo launchctl load -w /Library/LaunchDaemons/$daemonName sudo launchctl load -w /Library/LaunchDaemons/$daemonName
''; '';
fontDirs = [ fontDirs = [
xorg.fontbhttf
xorg.fontbhlucidatypewriter100dpi xorg.fontbhlucidatypewriter100dpi
xorg.fontbhlucidatypewriter75dpi xorg.fontbhlucidatypewriter75dpi
ttf_bitstream_vera ttf_bitstream_vera

View File

@ -6537,7 +6537,7 @@ in
licenseAccepted = (config.neoload.accept_license or false); licenseAccepted = (config.neoload.accept_license or false);
fontsConf = makeFontsConf { fontsConf = makeFontsConf {
fontDirectories = [ fontDirectories = [
xorg.fontbhttf dejavu_fonts.minimal
]; ];
}; };
}; };
@ -13726,7 +13726,7 @@ in
bluez5 = bluez5_28; bluez5 = bluez5_28;
fontsConf = makeFontsConf { fontsConf = makeFontsConf {
fontDirectories = [ fontDirectories = [
freefont_ttf xorg.fontmiscmisc xorg.fontbhttf freefont_ttf xorg.fontmiscmisc
]; ];
}; };
clucene_core = clucene_core_2; clucene_core = clucene_core_2;
@ -13745,7 +13745,7 @@ in
bluez5 = bluez5_28; bluez5 = bluez5_28;
fontsConf = makeFontsConf { fontsConf = makeFontsConf {
fontDirectories = [ fontDirectories = [
freefont_ttf xorg.fontmiscmisc xorg.fontbhttf freefont_ttf xorg.fontmiscmisc
]; ];
}; };
mdds = mdds_0_12_1; mdds = mdds_0_12_1;