mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-21 20:58:41 +03:00
* Provide a few fonts in a purely functional way, i.e., as part of the
system configuration. svn path=/nixos/trunk/; revision=7748
This commit is contained in:
parent
6db2c1814e
commit
eddd3a7e11
@ -81,8 +81,10 @@ import ../helpers/make-etc.nix {
|
||||
# (X11) client-rendered fonts.
|
||||
source = pkgs.substituteAll {
|
||||
src = ./etc/fonts/fonts.conf;
|
||||
fontDirectories = map (dir: "<dir>${dir}</dir>")
|
||||
[ # Search for fonts in...
|
||||
fontDirectories =
|
||||
let
|
||||
# Search for fonts in...
|
||||
runtimeDirs = [
|
||||
# - the user's .fonts directory
|
||||
"~/.fonts"
|
||||
# - the user's current profile
|
||||
@ -90,6 +92,15 @@ import ../helpers/make-etc.nix {
|
||||
# - the default profile
|
||||
"/nix/var/nix/profiles/default/lib/X11/fonts"
|
||||
];
|
||||
systemFonts = [
|
||||
# - a few statically built locations
|
||||
pkgs.xorg.fontbhttf
|
||||
pkgs.xorg.fontbh100dpi
|
||||
pkgs.xorg.fontbhlucidatypewriter100dpi
|
||||
pkgs.freefont_ttf
|
||||
];
|
||||
in
|
||||
map (dir: "<dir>${dir}</dir>") (runtimeDirs ++ systemFonts);
|
||||
};
|
||||
target = "fonts/fonts.conf";
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user