From 15e77dfb1c1e32a3ebfc006034047ad756ed7538 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Aug 2008 09:07:42 +0000
Subject: [PATCH] * Add some ugly fonts (like adobe-helvetica) required by some
   primitive applications.

svn path=/nixos/trunk/; revision=12700
---
 system/fonts.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/fonts.nix b/system/fonts.nix
index 0a2b1487982f..b9cf57103013 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -12,6 +12,9 @@
   # - a few statically built locations
   pkgs.xorg.fontbhttf
   pkgs.xorg.fontbhlucidatypewriter100dpi
+  pkgs.xorg.fontbhlucidatypewriter75dpi
+  pkgs.xorg.fontadobe100dpi
+  pkgs.xorg.fontadobe75dpi
   pkgs.ttf_bitstream_vera
   pkgs.freefont_ttf
   pkgs.xorg.fontbh100dpi
@@ -19,8 +22,8 @@
   pkgs.xorg.fontcursormisc
 ]
 
-++ (pkgs.lib.optional (config.fonts.enableCoreFonts) pkgs.corefonts)
+++ pkgs.lib.optional config.fonts.enableCoreFonts pkgs.corefonts
 
-++ pkgs.lib.optional (config.fonts.enableGhostscriptFonts) "${pkgs.ghostscript}/share/ghostscript/fonts"
+++ pkgs.lib.optional config.fonts.enableGhostscriptFonts "${pkgs.ghostscript}/share/ghostscript/fonts"
 
 ++ config.fonts.extraFonts