mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-21 20:58:41 +03:00
* Include fontconfig in the system path (for fc-list, fc-match etc.).
svn path=/nixos/trunk/; revision=23080
This commit is contained in:
parent
8de6ab7dff
commit
163a54886c
@ -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;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user