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

nixos/fontconfig: harmonize folder variables

Browse Source
This commit is contained in:
Jan Tojnar 2019-08-20 13:29:54 +02:00
parent be2cf1f093
commit 0d4fc97686
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,8 +227,8 @@ let
# local.conf (indirect priority 51) # local.conf (indirect priority 51)
${optionalString (cfg.localConf != "") '' ${optionalString (cfg.localConf != "") ''
ln -s ${localConf} $out/etc/fonts/local.conf ln -s ${localConf} $support_folder/../local.conf
ln -s ${localConf} $out/etc/fonts/${latestVersion}/local.conf ln -s ${localConf} $latest_folder/../local.conf
''} ''}
ln -s ${defaultFontsConf} $support_folder/52-default-fonts.conf ln -s ${defaultFontsConf} $support_folder/52-default-fonts.conf

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

@ -194,63 +194,63 @@ let
confPkg = pkgs.runCommand "fontconfig-conf" { confPkg = pkgs.runCommand "fontconfig-conf" {
preferLocalBuild = true; preferLocalBuild = true;
} '' } ''
support_folder=$out/etc/fonts support_folder=$out/etc/fonts/conf.d
latest_folder=$out/etc/fonts/${latestVersion} latest_folder=$out/etc/fonts/${latestVersion}/conf.d
mkdir -p $support_folder/conf.d mkdir -p $support_folder
mkdir -p $latest_folder/conf.d mkdir -p $latest_folder
# fonts.conf # 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
# fontconfig default config files # fontconfig default config files
ln -s ${supportPkg.out}/etc/fonts/conf.d/*.conf \ ln -s ${supportPkg.out}/etc/fonts/conf.d/*.conf \
$support_folder/conf.d/ $support_folder/
ln -s ${latestPkg.out}/etc/fonts/conf.d/*.conf \ ln -s ${latestPkg.out}/etc/fonts/conf.d/*.conf \
$latest_folder/conf.d/ $latest_folder/
# update latest 51-local.conf path to look at the latest local.conf # update latest 51-local.conf path to look at the latest local.conf
rm $latest_folder/conf.d/51-local.conf rm $latest_folder/51-local.conf
substitute ${latestPkg.out}/etc/fonts/conf.d/51-local.conf \ substitute ${latestPkg.out}/etc/fonts/conf.d/51-local.conf \
$latest_folder/conf.d/51-local.conf \ $latest_folder/51-local.conf \
--replace local.conf /etc/fonts/${latestVersion}/local.conf --replace local.conf /etc/fonts/${latestVersion}/local.conf
# 00-nixos-cache.conf # 00-nixos-cache.conf
ln -s ${cacheConfSupport} \ ln -s ${cacheConfSupport} \
$support_folder/conf.d/00-nixos-cache.conf $support_folder/00-nixos-cache.conf
ln -s ${cacheConfLatest} $latest_folder/conf.d/00-nixos-cache.conf ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf
# 10-nixos-rendering.conf # 10-nixos-rendering.conf
ln -s ${renderConf} $support_folder/conf.d/10-nixos-rendering.conf ln -s ${renderConf} $support_folder/10-nixos-rendering.conf
ln -s ${renderConf} $latest_folder/conf.d/10-nixos-rendering.conf ln -s ${renderConf} $latest_folder/10-nixos-rendering.conf
# 50-user.conf # 50-user.conf
${optionalString (!cfg.includeUserConf) '' ${optionalString (!cfg.includeUserConf) ''
rm $support_folder/conf.d/50-user.conf rm $support_folder/50-user.conf
rm $latest_folder/conf.d/50-user.conf rm $latest_folder/50-user.conf
''} ''}
# local.conf (indirect priority 51) # local.conf (indirect priority 51)
${optionalString (cfg.localConf != "") '' ${optionalString (cfg.localConf != "") ''
ln -s ${localConf} $support_folder/local.conf ln -s ${localConf} $support_folder/../local.conf
ln -s ${localConf} $latest_folder/local.conf ln -s ${localConf} $latest_folder/../local.conf
''} ''}
# 52-nixos-default-fonts.conf # 52-nixos-default-fonts.conf
ln -s ${defaultFontsConf} $support_folder/conf.d/52-nixos-default-fonts.conf ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf
ln -s ${defaultFontsConf} $latest_folder/conf.d/52-nixos-default-fonts.conf ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf
# 53-nixos-bitmaps.conf # 53-nixos-bitmaps.conf
ln -s ${rejectBitmaps} $support_folder/conf.d/53-nixos-bitmaps.conf ln -s ${rejectBitmaps} $support_folder/53-nixos-bitmaps.conf
ln -s ${rejectBitmaps} $latest_folder/conf.d/53-nixos-bitmaps.conf ln -s ${rejectBitmaps} $latest_folder/53-nixos-bitmaps.conf
${optionalString (!cfg.allowType1) '' ${optionalString (!cfg.allowType1) ''
# 53-nixos-reject-type1.conf # 53-nixos-reject-type1.conf
ln -s ${rejectType1} $support_folder/conf.d/53-nixos-reject-type1.conf ln -s ${rejectType1} $support_folder/53-nixos-reject-type1.conf
ln -s ${rejectType1} $latest_folder/conf.d/53-nixos-reject-type1.conf ln -s ${rejectType1} $latest_folder/53-nixos-reject-type1.conf
''} ''}
''; '';