* Make it possible to turn off the generation of fonts.conf. This is

important for the installation CD, where we don't want a dependency
  on all those fonts.  Of course, it's quite nice that turning off the
  generation of a file automatically removes the dependencies on the
  files referenced by that file.

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

configuration/rescue-cd.nix

@@ -49,6 +49,10 @@ rec {
       
     };
 
+    fonts = {
+      enableFontConfig = false;
+    };
+    
     installer = {
       nixpkgsURL = http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel;
     };

system/etc.nix

@@ -77,8 +77,11 @@ import ../helpers/make-etc.nix {
       target = "profile";
     }
 
-    { # Configuration file for fontconfig used to locate
+  ]
+
+  # Configuration file for fontconfig used to locate
   # (X11) client-rendered fonts.
+  ++ (optional ["fonts" "enableFontConfig"] { 
     source = pkgs.runCommand "fonts.conf"
       { 
         fontDirectories = [
@@ -102,9 +105,7 @@ import ../helpers/make-etc.nix {
           > $out
       ";
     target = "fonts/fonts.conf";
-    }
+  })
-
-  ]
 
   # LDAP configuration.
   ++ (optional ["users" "ldap" "enable"] {

system/options.nix

@@ -580,4 +580,17 @@
   }
 
 
+  {
+    name = ["fonts" "enableFontConfig"];
+    default = true;
+    description = "
+      If enabled, a fontconfig configuration file will be built
+      pointing to a set of default fonts.  If you don't care about
+      running X11 applications or any other program that uses
+      fontconfig, you can turn this option off and prevent a
+      dependency on all those fonts.
+    ";
+  }
+
+  
 ]