diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-29 15:26:39 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-29 15:26:39 +0000 |
| commit | 64cdcd8812ac33b6e8c7a26af8863a668035f942 (patch) | |
| tree | a2b5237cf73bc6275b65ecf53f2e155aa7ad224f | |
| parent | 71f6b12135d33b2ca2aabba31db60f4173182b7f (diff) | |
* 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
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 8d73dbb6f4376..dc8bb2a9b523a 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -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 = '' |