lol

treewide: stop using fontbhttf

+12 -13
+1 -1
nixos/modules/config/fonts/fonts.nix
··· 22 22 config = { 23 23 24 24 fonts.fonts = 25 - [ pkgs.xorg.fontbhttf 25 + [ 26 26 pkgs.xorg.fontbhlucidatypewriter100dpi 27 27 pkgs.xorg.fontbhlucidatypewriter75dpi 28 28 pkgs.dejavu_fonts
+4 -4
pkgs/development/libraries/fontconfig/default.nix
··· 1 - { stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, fontbhttf 1 + { stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, dejavu_fonts 2 2 , substituteAll }: 3 3 4 4 /** Font configuration scheme ··· 44 44 configureFlags = [ 45 45 "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/ 46 46 "--disable-docs" 47 - # just ~1MB; this is what you get when loading config fails for some reason 48 - "--with-default-fonts=${fontbhttf}" 47 + # just <1MB; this is what you get when loading config fails for some reason 48 + "--with-default-fonts=${dejavu_fonts.minimal}" 49 49 ]; 50 50 51 51 # We should find a better way to access the arch reliably. ··· 66 66 67 67 postInstall = '' 68 68 cd "$out/etc/fonts" 69 - "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \ 69 + "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${dejavu_fonts.minimal}" \ 70 70 --stringparam fontconfigConfigVersion "${configVersion}" \ 71 71 --path $out/share/xml/fontconfig \ 72 72 ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \
+1 -1
pkgs/development/libraries/fontconfig/make-fonts-cache.nix
··· 1 - { runCommand, lib, writeText, fontconfig, fontbhttf, fontDirectories }: 1 + { runCommand, lib, writeText, fontconfig, fontDirectories }: 2 2 3 3 runCommand "fc-cache" 4 4 rec {
+3 -3
pkgs/development/libraries/fontconfig/make-fonts-conf.nix
··· 1 - { runCommand, libxslt, fontconfig, fontbhttf, fontDirectories }: 1 + { runCommand, libxslt, fontconfig, dejavu_fonts, fontDirectories }: 2 2 3 3 runCommand "fonts.conf" 4 4 { 5 5 buildInputs = [ libxslt fontconfig ]; 6 - # Add a default font for non-nixos systems. fontbhttf is only about 1mb. 7 - fontDirectories = fontDirectories ++ [ fontbhttf ]; 6 + # Add a default font for non-nixos systems, <1MB and in nixos defaults. 7 + fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ]; 8 8 } 9 9 '' 10 10 xsltproc --stringparam fontDirectories "$fontDirectories" \
-1
pkgs/servers/x11/xquartz/default.nix
··· 60 60 sudo launchctl load -w /Library/LaunchDaemons/$daemonName 61 61 ''; 62 62 fontDirs = [ 63 - xorg.fontbhttf 64 63 xorg.fontbhlucidatypewriter100dpi 65 64 xorg.fontbhlucidatypewriter75dpi 66 65 ttf_bitstream_vera
+3 -3
pkgs/top-level/all-packages.nix
··· 6537 6537 licenseAccepted = (config.neoload.accept_license or false); 6538 6538 fontsConf = makeFontsConf { 6539 6539 fontDirectories = [ 6540 - xorg.fontbhttf 6540 + dejavu_fonts.minimal 6541 6541 ]; 6542 6542 }; 6543 6543 }; ··· 13726 13726 bluez5 = bluez5_28; 13727 13727 fontsConf = makeFontsConf { 13728 13728 fontDirectories = [ 13729 - freefont_ttf xorg.fontmiscmisc xorg.fontbhttf 13729 + freefont_ttf xorg.fontmiscmisc 13730 13730 ]; 13731 13731 }; 13732 13732 clucene_core = clucene_core_2; ··· 13745 13745 bluez5 = bluez5_28; 13746 13746 fontsConf = makeFontsConf { 13747 13747 fontDirectories = [ 13748 - freefont_ttf xorg.fontmiscmisc xorg.fontbhttf 13748 + freefont_ttf xorg.fontmiscmisc 13749 13749 ]; 13750 13750 }; 13751 13751 mdds = mdds_0_12_1;