diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-07-13 03:34:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-13 03:34:06 +0200 |
| commit | 09558f1dbf382e8fced432c4aa023e3aad895243 (patch) | |
| tree | ef7ff59bc821c13748556db8c7fc023c0e836292 /nixos/modules/config | |
| parent | 12834b3e87358e090a4021ca78f4e5b0b719d942 (diff) | |
| parent | 6f8345035bf07e4271fdf896d04e27f46a7e6e84 (diff) | |
| download | nixpkgs-09558f1dbf382e8fced432c4aa023e3aad895243.tar nixpkgs-09558f1dbf382e8fced432c4aa023e3aad895243.tar.gz nixpkgs-09558f1dbf382e8fced432c4aa023e3aad895243.tar.bz2 nixpkgs-09558f1dbf382e8fced432c4aa023e3aad895243.tar.lz nixpkgs-09558f1dbf382e8fced432c4aa023e3aad895243.tar.xz nixpkgs-09558f1dbf382e8fced432c4aa023e3aad895243.tar.zst nixpkgs-09558f1dbf382e8fced432c4aa023e3aad895243.zip | |
Merge pull request #73795 from worldofpeace/fontconfig-2.13.92
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/fonts/fontconfig.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index ac2a024eaa8..52d284f739b 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -214,15 +214,7 @@ let # fontconfig default config files ln -s ${supportPkg.out}/etc/fonts/conf.d/*.conf \ $support_folder/ - ln -s ${latestPkg.out}/etc/fonts/conf.d/*.conf \ - $latest_folder/ - - # update latest 51-local.conf path to look at the latest local.conf - rm $latest_folder/51-local.conf - - substitute ${latestPkg.out}/etc/fonts/conf.d/51-local.conf \ - $latest_folder/51-local.conf \ - --replace local.conf /etc/fonts/${latestVersion}/local.conf + # Latest fontconfig is configured to look for the upstream defaults inside the package. # 00-nixos-cache.conf ln -s ${cacheConfSupport} \ @@ -236,7 +228,11 @@ let # 50-user.conf ${optionalString (!cfg.includeUserConf) '' rm $support_folder/50-user.conf - rm $latest_folder/50-user.conf + ''} + # Since latest fontconfig looks for default files inside the package, + # we had to move this one elsewhere to be able to exclude it here. + ${optionalString cfg.includeUserConf '' + ln -s ${latestPkg.out}/etc/fonts/conf.d.bak/50-user.conf $latest_folder/50-user.conf ''} # local.conf (indirect priority 51) |