Fix Haskell x11-xft package.

svn path=/nixpkgs/trunk/; revision=26430
This commit is contained in:
Andres Löh 2011-03-20 13:23:53 +00:00
parent bff378c965
commit 19b2375799
2 changed files with 4 additions and 3 deletions

View file

@ -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";

View file

@ -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;
};