diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-04-03 08:48:50 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-04-03 09:26:19 -0500 |
| commit | 89bfa112cfd8a8b3da642169d33f1dfe3ea1e839 (patch) | |
| tree | e8646f420a5eb4b9c7149f35a1ee45a3c62f7cce /nixos/modules/config/fonts/fontconfig.nix | |
| parent | 03942659ca1189ba50f9f1b86bbe6d925eba237b (diff) | |
| download | nixpkgs-89bfa112cfd8a8b3da642169d33f1dfe3ea1e839.tar nixpkgs-89bfa112cfd8a8b3da642169d33f1dfe3ea1e839.tar.gz nixpkgs-89bfa112cfd8a8b3da642169d33f1dfe3ea1e839.tar.bz2 nixpkgs-89bfa112cfd8a8b3da642169d33f1dfe3ea1e839.tar.lz nixpkgs-89bfa112cfd8a8b3da642169d33f1dfe3ea1e839.tar.xz nixpkgs-89bfa112cfd8a8b3da642169d33f1dfe3ea1e839.tar.zst nixpkgs-89bfa112cfd8a8b3da642169d33f1dfe3ea1e839.zip | |
fontconfig-penultimate: 0.2.1 -> 0.3.2
Diffstat (limited to 'nixos/modules/config/fonts/fontconfig.nix')
| -rw-r--r-- | nixos/modules/config/fonts/fontconfig.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 1cf5cb6e039..d44b583447a 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -444,11 +444,14 @@ in }; }; - config = mkIf cfg.enable { - fonts.fontconfig.confPackages = [ confPkg ]; - - environment.systemPackages = [ pkgs.fontconfig ]; - environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/"; - }; + config = mkMerge [ + (mkIf cfg.enable { + environment.systemPackages = [ pkgs.fontconfig ]; + environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/"; + }) + (mkIf (cfg.enable && !cfg.penultimate.enable) { + fonts.fontconfig.confPackages = [ confPkg ]; + }) + ]; } |