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

nixos/fontconfig: harmonize file names

Browse Source
This commit is contained in:
Jan Tojnar 2019-08-20 13:32:15 +02:00
parent 0d4fc97686
commit e7dc9d0b90
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 10 additions and 10 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

@ -151,7 +151,7 @@ let
</fontconfig> </fontconfig>
''; '';
rejectType1 = pkgs.writeText "fc-53-no-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">
<fontconfig> <fontconfig>
@ -169,7 +169,7 @@ let
''; '';
# The configuration to be included in /etc/font/ # The configuration to be included in /etc/font/
penultimateConf = pkgs.runCommand "font-penultimate-conf" { penultimateConf = pkgs.runCommand "fontconfig-penultimate-conf" {
preferLocalBuild = true; preferLocalBuild = true;
} '' } ''
support_folder=$out/etc/fonts/conf.d support_folder=$out/etc/fonts/conf.d
@ -231,8 +231,8 @@ let
ln -s ${localConf} $latest_folder/../local.conf ln -s ${localConf} $latest_folder/../local.conf
''} ''}
ln -s ${defaultFontsConf} $support_folder/52-default-fonts.conf ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf
ln -s ${defaultFontsConf} $latest_folder/52-default-fonts.conf ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf
${optionalString cfg.allowBitmaps '' ${optionalString cfg.allowBitmaps ''
rm $support_folder/53-no-bitmaps.conf rm $support_folder/53-no-bitmaps.conf
@ -240,8 +240,8 @@ let
''} ''}
${optionalString (!cfg.allowType1) '' ${optionalString (!cfg.allowType1) ''
ln -s ${rejectType1} $support_folder/53-no-type1.conf ln -s ${rejectType1} $support_folder/53-nixos-reject-type1.conf
ln -s ${rejectType1} $latest_folder/53-no-type1.conf ln -s ${rejectType1} $latest_folder/53-nixos-reject-type1.conf
''} ''}
''; '';

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

@ -145,7 +145,7 @@ let
# bitmap font options # bitmap font options
# priority 53 # priority 53
rejectBitmaps = pkgs.writeText "fc-53-nixos-bitmaps.conf" '' rejectBitmaps = pkgs.writeText "fc-53-no-bitmaps.conf" ''
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig> <fontconfig>
@ -243,9 +243,9 @@ let
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-nixos-bitmaps.conf # 53-no-bitmaps.conf
ln -s ${rejectBitmaps} $support_folder/53-nixos-bitmaps.conf ln -s ${rejectBitmaps} $support_folder/53-no-bitmaps.conf
ln -s ${rejectBitmaps} $latest_folder/53-nixos-bitmaps.conf ln -s ${rejectBitmaps} $latest_folder/53-no-bitmaps.conf
${optionalString (!cfg.allowType1) '' ${optionalString (!cfg.allowType1) ''
# 53-nixos-reject-type1.conf # 53-nixos-reject-type1.conf