From 19b237579926d5c6c3ac609a993f2e98675b8d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 20 Mar 2011 13:23:53 +0000
Subject: [PATCH] Fix Haskell x11-xft package.

svn path=/nixpkgs/trunk/; revision=26430
---
 pkgs/development/libraries/haskell/X11-xft/default.nix | 5 +++--
 pkgs/top-level/haskell-packages.nix                    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix
index 95327cb5288..3a8a7face7c 100644
--- a/pkgs/development/libraries/haskell/X11-xft/default.nix
+++ b/pkgs/development/libraries/haskell/X11-xft/default.nix
@@ -1,10 +1,11 @@
-{ ghc, cabal, X11, utf8String, pkgconfig, libXft }:
+{ ghc, cabal, X11, utf8String, pkgconfig, libXft, freetype, fontconfig }:
 cabal.mkDerivation (self : {
   pname = "X11-xft";
   version = "0.3";
   sha256 = "48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d";
-  buildInputs = [ ghc pkgconfig libXft ];
+  buildInputs = [ ghc pkgconfig libXft freetype fontconfig ];
   propagatedBuildInputs = [ X11 utf8String ];
+  configureFlags=["--extra-include-dirs=${freetype}/include/freetype2"];
   meta = {
     homepage = http://hackage.haskell.org/package/X11-xft;
     description = "Haskell bindings to the Xft and some Xrender parts";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index af6036ed45f..7c589d9113d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -902,7 +902,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   };
 
   X11Xft = callPackage ../development/libraries/haskell/X11-xft {
-    inherit (pkgs) pkgconfig;
+    inherit (pkgs) pkgconfig freetype fontconfig;
     inherit (pkgs.xlibs) libXft;
   };