From cf28e6d3411c7e5fa5ec5ba2e1960809c1c2c417 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Mar 2008 14:30:19 +0000
Subject: [PATCH] MS Core Fonts are now optional

svn path=/nixos/trunk/; revision=10962
---
 system/fonts.nix   | 3 ++-
 system/options.nix | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/system/fonts.nix b/system/fonts.nix
index f63735c698d..16b37b251a0 100644
--- a/system/fonts.nix
+++ b/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)
diff --git a/system/options.nix b/system/options.nix
index 98362e68182..414bd90939b 100644
--- a/system/options.nix
+++ b/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).
+      ";
+    };
+
   };