BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

haskell-X11: updated build expression

Browse source 
svn path=/nixpkgs/trunk/; revision=29036
This commit is contained in:
Peter Simons 2011-09-05 19:24:01 +00:00
parent 378009ff4a
commit e373f558da
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/libraries/haskell/X11/default.nix
View file

@ -1,12 +1,11 @@
{cabal, syb, libX11, xineramaSupport ? true, libXinerama ? null, libXext ? null}:
{ cabal, libX11, libXext, libXinerama, syb }:
assert xineramaSupport -> (libXinerama != null && libXext != null);
cabal.mkDerivation (self : {
cabal.mkDerivation (self: {
pname = "X11";
version = "1.5.0.0";
sha256 = "653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f";
propagatedBuildInputs = [libX11 syb] ++ (if xineramaSupport then [libXinerama libXext] else []);
buildDepends = [ syb ];
extraLibraries = [ libX11 libXext libXinerama ];
meta = {
homepage = "http://code.haskell.org/X11";
description = "A binding to the X11 graphics library";

5
pkgs/top-level/haskell-packages.nix
View file

@ -1283,10 +1283,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {};
X11 = callPackage ../development/libraries/haskell/X11 {
inherit (pkgs.xlibs) libX11 libXinerama libXext;
xineramaSupport = true;
};
X11 = callPackage ../development/libraries/haskell/X11 {};
X11Xft = callPackage ../development/libraries/haskell/X11-xft {
inherit (pkgs) pkgconfig freetype fontconfig;