MS Core Fonts are now optional

svn path=/nixos/trunk/; revision=10962

system/fonts.nix

@@ -13,13 +13,14 @@
   pkgs.xorg.fontbhttf
   pkgs.xorg.fontbhlucidatypewriter100dpi
   pkgs.ttf_bitstream_vera
-  pkgs.corefonts
   pkgs.freefont_ttf
   pkgs.xorg.fontbh100dpi
   pkgs.xorg.fontmiscmisc
   pkgs.xorg.fontcursormisc
 ]
 
+++ (pkgs.lib.optional (config.fonts.enableCoreFonts) pkgs.corefonts)
+
 ++ pkgs.lib.optional (config.fonts.enableGhostscriptFonts) "${pkgs.ghostscript}/share/ghostscript/fonts"
 
 ++ ((config.fonts.extraFonts) pkgs)

system/options.nix

@@ -2050,6 +2050,13 @@ root        ALL=(ALL) SETENV: ALL
       ";
     };
 
+    enableCoreFonts = mkOption {
+      default = true;
+      description = "
+        Whether to include MS Core Fonts (redistributable, but only verbatim).
+      ";
+    };
+
   };