mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Fix Haskell x11-xft package.
svn path=/nixpkgs/trunk/; revision=26430
This commit is contained in:
parent
bff378c965
commit
19b2375799
|
@ -1,10 +1,11 @@
|
||||||
{ ghc, cabal, X11, utf8String, pkgconfig, libXft }:
|
{ ghc, cabal, X11, utf8String, pkgconfig, libXft, freetype, fontconfig }:
|
||||||
cabal.mkDerivation (self : {
|
cabal.mkDerivation (self : {
|
||||||
pname = "X11-xft";
|
pname = "X11-xft";
|
||||||
version = "0.3";
|
version = "0.3";
|
||||||
sha256 = "48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d";
|
sha256 = "48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d";
|
||||||
buildInputs = [ ghc pkgconfig libXft ];
|
buildInputs = [ ghc pkgconfig libXft freetype fontconfig ];
|
||||||
propagatedBuildInputs = [ X11 utf8String ];
|
propagatedBuildInputs = [ X11 utf8String ];
|
||||||
|
configureFlags=["--extra-include-dirs=${freetype}/include/freetype2"];
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://hackage.haskell.org/package/X11-xft;
|
homepage = http://hackage.haskell.org/package/X11-xft;
|
||||||
description = "Haskell bindings to the Xft and some Xrender parts";
|
description = "Haskell bindings to the Xft and some Xrender parts";
|
||||||
|
|
|
@ -902,7 +902,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||||
};
|
};
|
||||||
|
|
||||||
X11Xft = callPackage ../development/libraries/haskell/X11-xft {
|
X11Xft = callPackage ../development/libraries/haskell/X11-xft {
|
||||||
inherit (pkgs) pkgconfig;
|
inherit (pkgs) pkgconfig freetype fontconfig;
|
||||||
inherit (pkgs.xlibs) libXft;
|
inherit (pkgs.xlibs) libXft;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue