ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-22 05:07:45 +03:00
Code Issues Projects Releases Wiki Activity

* Provide a few fonts in a purely functional way, i.e., as part of the

Browse Source 
system configuration. 

svn path=/nixos/trunk/; revision=7748
This commit is contained in:
Eelco Dolstra 2007-01-22 16:05:37 +00:00
parent 6db2c1814e
commit eddd3a7e11
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
system/etc.nix
View File

@ -81,8 +81,10 @@ import ../helpers/make-etc.nix {
# (X11) client-rendered fonts. # (X11) client-rendered fonts.
source = pkgs.substituteAll { source = pkgs.substituteAll {
src = ./etc/fonts/fonts.conf; src = ./etc/fonts/fonts.conf;
fontDirectories = map (dir: "<dir>${dir}</dir>") fontDirectories =
[ # Search for fonts in... let
# Search for fonts in...
runtimeDirs = [
# - the user's .fonts directory # - the user's .fonts directory
"~/.fonts" "~/.fonts"
# - the user's current profile # - the user's current profile
@ -90,6 +92,15 @@ import ../helpers/make-etc.nix {
# - the default profile # - the default profile
"/nix/var/nix/profiles/default/lib/X11/fonts" "/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"; target = "fonts/fonts.conf";
} }