From 163a54886c809b15e2320d4f546f9ff2f8887ab5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Aug 2010 00:03:36 +0000 Subject: [PATCH] * Include fontconfig in the system path (for fc-list, fc-match etc.). svn path=/nixos/trunk/; revision=23080 --- modules/config/fonts.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix index c94f16992bd..8b7ba6fab94 100644 --- a/modules/config/fonts.nix +++ b/modules/config/fonts.nix @@ -1,8 +1,10 @@ -{pkgs, config, ...}: +{ config, pkgs, ... }: + +with pkgs.lib; ###### interface + let - inherit (pkgs.lib) mkOption; options = { @@ -19,7 +21,7 @@ let "; }; - # should be move elsewhere. + # Should be moved elsewhere. enableGhostscriptFonts = mkOption { default = false; description = " @@ -66,8 +68,8 @@ let pkgs.xorg.fontmiscmisc pkgs.xorg.fontcursormisc ] - ++ pkgs.lib.optional config.fonts.enableCoreFonts pkgs.corefonts - ++ pkgs.lib.optional config.fonts.enableGhostscriptFonts "${pkgs.ghostscript}/share/ghostscript/fonts" + ++ optional config.fonts.enableCoreFonts pkgs.corefonts + ++ optional config.fonts.enableGhostscriptFonts "${pkgs.ghostscript}/share/ghostscript/fonts" ++ config.fonts.extraFonts; }; @@ -156,7 +158,6 @@ let }; }; - inherit (pkgs.lib) mkIf; in { @@ -180,5 +181,6 @@ in ''; 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; }