mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
* Disable XCB support in Cairo, since it's not really supported
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:
parent
71f6b12135
commit
64cdcd8812
|
@ -1,12 +1,14 @@
|
||||||
{ postscriptSupport ? true
|
{ postscriptSupport ? true
|
||||||
, pdfSupport ? true
|
, pdfSupport ? true
|
||||||
, pngSupport ? true
|
, pngSupport ? true
|
||||||
|
, xcbSupport ? false
|
||||||
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
|
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
|
||||||
, zlib, libpng, pixman, libxcb, xcbutil
|
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert postscriptSupport -> zlib != null;
|
assert postscriptSupport -> zlib != null;
|
||||||
assert pngSupport -> libpng != null;
|
assert pngSupport -> libpng != null;
|
||||||
|
assert xcbSupport -> libxcb != null && xcbutil != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "cairo-1.8.8";
|
name = "cairo-1.8.8";
|
||||||
|
@ -16,16 +18,17 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "140w8pz2k2kmjdaav3rfy009rjf2hqycsnk7lq0nwnf4bpgd6l9w";
|
sha256 = "140w8pz2k2kmjdaav3rfy009rjf2hqycsnk7lq0nwnf4bpgd6l9w";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs =
|
||||||
pkgconfig x11 fontconfig pixman libxcb xcbutil
|
[ pkgconfig x11 fontconfig pixman ] ++
|
||||||
];
|
stdenv.lib.optionals xcbSupport [ libxcb xcbutil ];
|
||||||
|
|
||||||
propagatedBuildInputs =
|
propagatedBuildInputs =
|
||||||
[ freetype ] ++
|
[ freetype ] ++
|
||||||
stdenv.lib.optional postscriptSupport zlib ++
|
stdenv.lib.optional postscriptSupport zlib ++
|
||||||
stdenv.lib.optional pngSupport libpng;
|
stdenv.lib.optional pngSupport libpng;
|
||||||
|
|
||||||
configureFlags = ["--enable-xcb"] ++
|
configureFlags =
|
||||||
|
stdenv.lib.optional xcbSupport "--enable-xcb" ++
|
||||||
stdenv.lib.optional pdfSupport "--enable-pdf";
|
stdenv.lib.optional pdfSupport "--enable-pdf";
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
|
Loading…
Reference in a new issue