colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: stop using fontbhttf

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/config/fonts/fonts.nix
View File

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

8
pkgs/development/libraries/fontconfig/default.nix
View File

@ -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 \

2
pkgs/development/libraries/fontconfig/make-fonts-cache.nix
View File

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

6
pkgs/development/libraries/fontconfig/make-fonts-conf.nix
View File

@ -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" \

1
pkgs/servers/x11/xquartz/default.nix
View File

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

6
pkgs/top-level/all-packages.nix
View File

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