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

* Include fontconfig in the system path (for fc-list, fc-match etc.).

Browse Source 
svn path=/nixos/trunk/; revision=23080
This commit is contained in:
Eelco Dolstra 2010-08-10 00:03:36 +00:00
parent 8de6ab7dff
commit 163a54886c
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/config/fonts.nix
View File

@ -1,8 +1,10 @@
{pkgs, config, ...}: { config, pkgs, ... }:
with pkgs.lib;
###### interface ###### interface
let let
inherit (pkgs.lib) mkOption;
options = { options = {
@ -19,7 +21,7 @@ let
"; ";
}; };
# should be move elsewhere. # Should be moved elsewhere.
enableGhostscriptFonts = mkOption { enableGhostscriptFonts = mkOption {
default = false; default = false;
description = " description = "
@ -66,8 +68,8 @@ let
pkgs.xorg.fontmiscmisc pkgs.xorg.fontmiscmisc
pkgs.xorg.fontcursormisc pkgs.xorg.fontcursormisc
] ]
++ pkgs.lib.optional config.fonts.enableCoreFonts pkgs.corefonts ++ optional config.fonts.enableCoreFonts pkgs.corefonts
++ pkgs.lib.optional config.fonts.enableGhostscriptFonts "${pkgs.ghostscript}/share/ghostscript/fonts" ++ optional config.fonts.enableGhostscriptFonts "${pkgs.ghostscript}/share/ghostscript/fonts"
++ config.fonts.extraFonts; ++ config.fonts.extraFonts;
}; };
@ -156,7 +158,6 @@ let
}; };
}; };
inherit (pkgs.lib) mkIf;
in in
{ {
@ -180,5 +181,6 @@ in
''; '';
environment.systemPackages = environment.systemPackages =
pkgs.lib.optional config.fonts.enableFontDir config.system.build.x11Fonts; optional config.fonts.enableFontDir config.system.build.x11Fonts ++
optional config.fonts.enableFontConfig pkgs.fontconfig;
} }