Merge pull request #23819 from ttuegel/freetype

FreeType 2.7.1 and Fontconfig defaults
2017-03-20 11:43:50 -05:00
parent 48bc3cf9f4 d458b5401a
commit 1b0d9e9ae6
16 changed files with 223 additions and 122 deletions
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1,8 +1,9 @@
 [
  ./config/debug-info.nix
  ./config/fonts/corefonts.nix
-  ./config/fonts/fontconfig-ultimate.nix
  ./config/fonts/fontconfig.nix
+  ./config/fonts/fontconfig-penultimate.nix
+  ./config/fonts/fontconfig-ultimate.nix
  ./config/fonts/fontdir.nix
  ./config/fonts/fonts.nix
  ./config/fonts/ghostscript.nix