From a62e1cf2dd50d2b7cf08bd42abaf8f3df236e382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 8 Jul 2009 14:52:58 +0000
Subject: [PATCH] Disable proprietary fonts by default.

svn path=/nixos/branches/modular-nixos/; revision=16253
---
 modules/config/fonts.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index 47e505b3cb56..51ddc9e5d438 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -72,16 +72,19 @@ let
 
       extraFonts = mkOption {
         default = [];
-        description = "
+        description = ''
           List of additional fonts.
-        ";
+        '';
       };
 
       enableCoreFonts = mkOption {
-        default = true;
-        description = "
-          Whether to include MS Core Fonts (redistributable, but only verbatim).
-        ";
+        default = false;
+        description = ''
+          Whether to include Microsoft's proprietary Core Fonts.  These fonts
+          are redistributable, but only verbatim, among other restrictions.
+          See <link xlink:href="http://corefonts.sourceforge.net/eula.htm"/>
+          for details.
+       '';
       };
 
     };