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

nixos/fontconfig: harmonize comments

Browse Source
This commit is contained in:
Jan Tojnar 2019-08-20 13:42:39 +02:00
parent e7dc9d0b90
commit 67367587eb
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/config/fonts/fontconfig-penultimate.nix
View File

@ -52,8 +52,11 @@ let
</fontconfig> </fontconfig>
''; '';
# local configuration file
localConf = pkgs.writeText "fc-local.conf" cfg.localConf; localConf = pkgs.writeText "fc-local.conf" cfg.localConf;
# rendering settings configuration files
# priority 10
hintingConf = pkgs.writeText "fc-10-hinting.conf" '' hintingConf = pkgs.writeText "fc-10-hinting.conf" ''
<?xml version='1.0'?> <?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
@ -122,6 +125,8 @@ let
</fontconfig> </fontconfig>
''; '';
# default fonts configuration file
# priority 52
defaultFontsConf = defaultFontsConf =
let genDefault = fonts: name: let genDefault = fonts: name:
optionalString (fonts != []) '' optionalString (fonts != []) ''
@ -151,6 +156,8 @@ let
</fontconfig> </fontconfig>
''; '';
# reject Type 1 fonts
# priority 53
rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" '' rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" ''
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
@ -178,6 +185,7 @@ let
mkdir -p $support_folder mkdir -p $support_folder
mkdir -p $latest_folder mkdir -p $latest_folder
# fonts.conf
ln -s ${supportFontsConf} $support_folder/../fonts.conf ln -s ${supportFontsConf} $support_folder/../fonts.conf
ln -s ${latestPkg.out}/etc/fonts/fonts.conf \ ln -s ${latestPkg.out}/etc/fonts/fonts.conf \
$latest_folder/../fonts.conf $latest_folder/../fonts.conf
@ -213,6 +221,7 @@ let
ln -s ${dpiConf} $latest_folder/11-dpi.conf ln -s ${dpiConf} $latest_folder/11-dpi.conf
''} ''}
# 50-user.conf
${optionalString (!cfg.includeUserConf) '' ${optionalString (!cfg.includeUserConf) ''
rm $support_folder/50-user.conf rm $support_folder/50-user.conf
rm $latest_folder/50-user.conf rm $latest_folder/50-user.conf
@ -231,15 +240,18 @@ let
ln -s ${localConf} $latest_folder/../local.conf ln -s ${localConf} $latest_folder/../local.conf
''} ''}
# 52-nixos-default-fonts.conf
ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf
ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf
# 53-no-bitmaps.conf
${optionalString cfg.allowBitmaps '' ${optionalString cfg.allowBitmaps ''
rm $support_folder/53-no-bitmaps.conf rm $support_folder/53-no-bitmaps.conf
rm $latest_folder/53-no-bitmaps.conf rm $latest_folder/53-no-bitmaps.conf
''} ''}
${optionalString (!cfg.allowType1) '' ${optionalString (!cfg.allowType1) ''
# 53-nixos-reject-type1.conf
ln -s ${rejectType1} $support_folder/53-nixos-reject-type1.conf ln -s ${rejectType1} $support_folder/53-nixos-reject-type1.conf
ln -s ${rejectType1} $latest_folder/53-nixos-reject-type1.conf ln -s ${rejectType1} $latest_folder/53-nixos-reject-type1.conf
''} ''}

1
nixos/modules/config/fonts/fontconfig.nix
View File

@ -109,7 +109,6 @@ let
''; '';
# local configuration file # local configuration file
# priority 51
localConf = pkgs.writeText "fc-local.conf" cfg.localConf; localConf = pkgs.writeText "fc-local.conf" cfg.localConf;
# default fonts configuration file # default fonts configuration file