swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Disable XCB support in Cairo, since it's not really supported

Browse source 
currently
  (http://lists.freedesktop.org/archives/xcb/2008-December/004140.html).

svn path=/nixpkgs/branches/xorg-7.5/; revision=18030
This commit is contained in:
Eelco Dolstra 2009-10-29 15:26:39 +00:00
parent 71f6b12135
commit 64cdcd8812
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/libraries/cairo/default.nix
View file

@ -1,12 +1,14 @@
{ postscriptSupport ? true
, pdfSupport ? true
, pngSupport ? true
, xcbSupport ? false
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
, zlib, libpng, pixman, libxcb, xcbutil
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null
}:
assert postscriptSupport -> zlib != null;
assert pngSupport -> libpng != null;
assert xcbSupport -> libxcb != null && xcbutil != null;
stdenv.mkDerivation rec {
name = "cairo-1.8.8";
@ -16,16 +18,17 @@ stdenv.mkDerivation rec {
sha256 = "140w8pz2k2kmjdaav3rfy009rjf2hqycsnk7lq0nwnf4bpgd6l9w";
};
buildInputs = [
pkgconfig x11 fontconfig pixman libxcb xcbutil
];
buildInputs =
[ pkgconfig x11 fontconfig pixman ] ++
stdenv.lib.optionals xcbSupport [ libxcb xcbutil ];
propagatedBuildInputs =
[ freetype ] ++
stdenv.lib.optional postscriptSupport zlib ++
stdenv.lib.optional pngSupport libpng;
configureFlags = ["--enable-xcb"] ++
configureFlags =
stdenv.lib.optional xcbSupport "--enable-xcb" ++
stdenv.lib.optional pdfSupport "--enable-pdf";
preConfigure = ''