treewide: stop using fontbhttf

Changed files
+12 -13
nixos
modules
config
fonts
pkgs
development
servers
x11
xquartz
top-level
+1 -1
nixos/modules/config/fonts/fonts.nix
···
config = {
fonts.fonts =
-
[ pkgs.xorg.fontbhttf
+
[
pkgs.xorg.fontbhlucidatypewriter100dpi
pkgs.xorg.fontbhlucidatypewriter75dpi
pkgs.dejavu_fonts
+4 -4
pkgs/development/libraries/fontconfig/default.nix
···
-
{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, fontbhttf
+
{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, dejavu_fonts
, substituteAll }:
/** Font configuration scheme
···
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.
···
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 -1
pkgs/development/libraries/fontconfig/make-fonts-cache.nix
···
-
{ runCommand, lib, writeText, fontconfig, fontbhttf, fontDirectories }:
+
{ runCommand, lib, writeText, fontconfig, fontDirectories }:
runCommand "fc-cache"
rec {
+3 -3
pkgs/development/libraries/fontconfig/make-fonts-conf.nix
···
-
{ 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" \
-1
pkgs/servers/x11/xquartz/default.nix
···
sudo launchctl load -w /Library/LaunchDaemons/$daemonName
'';
fontDirs = [
-
xorg.fontbhttf
xorg.fontbhlucidatypewriter100dpi
xorg.fontbhlucidatypewriter75dpi
ttf_bitstream_vera
+3 -3
pkgs/top-level/all-packages.nix
···
licenseAccepted = (config.neoload.accept_license or false);
fontsConf = makeFontsConf {
fontDirectories = [
-
xorg.fontbhttf
+
dejavu_fonts.minimal
];
};
};
···
bluez5 = bluez5_28;
fontsConf = makeFontsConf {
fontDirectories = [
-
freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
+
freefont_ttf xorg.fontmiscmisc
clucene_core = clucene_core_2;
···
bluez5 = bluez5_28;
fontsConf = makeFontsConf {
fontDirectories = [
-
freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
+
freefont_ttf xorg.fontmiscmisc
mdds = mdds_0_12_1;