From 618b726542fc610d5592ba45b5e0b80d9226847e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Aug 2008 10:00:49 +0000
Subject: [PATCH] * Don't put the Adobe bitmap fonts in the fontconfig search
 path   because then Helvetica looks horrible.

svn path=/nixos/trunk/; revision=12736
---
 system/fonts.nix         |  2 --
 upstart-jobs/xserver.nix | 13 +++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/system/fonts.nix b/system/fonts.nix
index b9cf5710301..f0be6dd1de0 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -13,8 +13,6 @@
   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
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index a528952c6b1..ff068a04a15 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -53,6 +53,19 @@ let
     ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
 
 
+  fontsForXServer =
+    fontDirectories ++
+    # We don't want these fonts in fonts.conf, because then modern,
+    # fontconfig-based applications will get horrible bitmapped
+    # Helvetica fonts.  It's better to get a substitution (like Nimbus
+    # Sans) than that horror.  But we do need the Adobe fonts for some
+    # old non-fontconfig applications.  (Possibly this could be done
+    # better using a fontconfig rule.)
+    [ pkgs.xorg.fontadobe100dpi
+      pkgs.xorg.fontadobe75dpi
+    ];
+    
+
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;