diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-10-14 14:46:56 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-10-14 14:46:56 +0000 |
commit | c9c20456103efd7b903ad1586dbb81f63f4342c8 (patch) | |
tree | 96001b6d759a475d2bf3bee52f27a96af7ee88e6 /pkgs/development/libraries/cairo | |
parent | f940eda22dea474b299add7046cf386ae271ba1a (diff) | |
download | nixlib-c9c20456103efd7b903ad1586dbb81f63f4342c8.tar nixlib-c9c20456103efd7b903ad1586dbb81f63f4342c8.tar.gz nixlib-c9c20456103efd7b903ad1586dbb81f63f4342c8.tar.bz2 nixlib-c9c20456103efd7b903ad1586dbb81f63f4342c8.tar.lz nixlib-c9c20456103efd7b903ad1586dbb81f63f4342c8.tar.xz nixlib-c9c20456103efd7b903ad1586dbb81f63f4342c8.tar.zst nixlib-c9c20456103efd7b903ad1586dbb81f63f4342c8.zip |
* Cairo: build with XCB support.
* Fixed libXp. svn path=/nixpkgs/branches/stdenv-updates/; revision=13069
Diffstat (limited to 'pkgs/development/libraries/cairo')
-rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 3a0d06dbcce3..46e6dfba2d47 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -2,7 +2,7 @@ , pdfSupport ? true , pngSupport ? true , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype -, zlib, libpng, pixman +, zlib, libpng, pixman, libxcb, xcbutil }: assert postscriptSupport -> zlib != null; @@ -17,14 +17,14 @@ stdenv.mkDerivation { }; buildInputs = [ - pkgconfig x11 fontconfig freetype pixman + pkgconfig x11 fontconfig freetype pixman libxcb xcbutil ]; propagatedBuildInputs = stdenv.lib.optional postscriptSupport zlib ++ stdenv.lib.optional pngSupport libpng; - configureFlags = ["--disable-static"] ++ + configureFlags = ["--disable-static" "--enable-xcb"] ++ stdenv.lib.optional pdfSupport "--enable-pdf"; meta = { |