From 440c82b96fe1debf702a188466555866b7365321 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Mar 2011 10:25:26 +0000
Subject: [PATCH] * Fix the ratpoison build
 (http://hydra.nixos.org/build/915825).

svn path=/nixpkgs/branches/x-updates/; revision=26296
---
 pkgs/applications/window-managers/ratpoison/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                         | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index df8c97466ff..77a998b9f74 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig
+{ stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig, freetype
 , libXtst, xextproto, readline, libXi, pkgconfig, perl, autoconf, automake }:
 
 stdenv.mkDerivation rec {
@@ -18,8 +18,10 @@ stdenv.mkDerivation rec {
 
   preConfigure = "autoreconf -vf";	# needed because of the patch above
 
+  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; # urgh
+  
   buildInputs =
-    [ libX11 inputproto libXt libXpm libXft fontconfig libXtst
+    [ libX11 inputproto libXt libXpm libXft fontconfig freetype libXtst
       xextproto readline libXi pkgconfig perl autoconf automake
     ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a4a895c80d..da69a881e52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5940,9 +5940,7 @@ let
       libgnomeui libglade glib gtk scrollkeeper gnome_keyring;
   });
 
-  evolution_data_server = (newScope (gnome // gtkLibs))
-  ../servers/evolution-data-server {
-  };
+  evolution_data_server = newScope (gnome // gtkLibs) ../servers/evolution-data-server { };
 
   exrdisplay = callPackage ../applications/graphics/exrdisplay {
     fltk = fltk20;