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

nixos/fontconfig: harmonize indentation

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

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

@ -14,11 +14,12 @@ Low number means high priority.
*/ */
{ config, lib, pkgs, ... }: { config, pkgs, lib, ... }:
with lib; with lib;
let cfg = config.fonts.fontconfig; let
cfg = config.fonts.fontconfig;
fcBool = x: "<bool>" + (boolToString x) + "</bool>"; fcBool = x: "<bool>" + (boolToString x) + "</bool>";
@ -190,7 +191,9 @@ let cfg = config.fonts.fontconfig;
''; '';
# fontconfig configuration package # fontconfig configuration package
confPkg = pkgs.runCommand "fontconfig-conf" { preferLocalBuild = true; } '' confPkg = pkgs.runCommand "fontconfig-conf" {
preferLocalBuild = true;
} ''
support_folder=$out/etc/fonts support_folder=$out/etc/fonts
latest_folder=$out/etc/fonts/${latestVersion} latest_folder=$out/etc/fonts/${latestVersion}
@ -225,7 +228,7 @@ let cfg = config.fonts.fontconfig;
ln -s ${renderConf} $latest_folder/conf.d/10-nixos-rendering.conf ln -s ${renderConf} $latest_folder/conf.d/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/conf.d/50-user.conf
rm $latest_folder/conf.d/50-user.conf rm $latest_folder/conf.d/50-user.conf
''} ''}
@ -244,7 +247,7 @@ let cfg = config.fonts.fontconfig;
ln -s ${rejectBitmaps} $support_folder/conf.d/53-nixos-bitmaps.conf ln -s ${rejectBitmaps} $support_folder/conf.d/53-nixos-bitmaps.conf
ln -s ${rejectBitmaps} $latest_folder/conf.d/53-nixos-bitmaps.conf ln -s ${rejectBitmaps} $latest_folder/conf.d/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/conf.d/53-nixos-reject-type1.conf
ln -s ${rejectType1} $latest_folder/conf.d/53-nixos-reject-type1.conf ln -s ${rejectType1} $latest_folder/conf.d/53-nixos-reject-type1.conf