public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for gl backend to cairo.

Browse Source 
This is also needed for the Weston compositor.
This commit is contained in:
Carles Pagès 2012-12-02 12:25:29 +01:00
parent 22f4b5c637
commit 660c96b6df
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/cairo/default.nix
View File

@ -2,15 +2,17 @@
, pdfSupport ? true , pdfSupport ? true
, pngSupport ? true , pngSupport ? true
, xcbSupport ? false , xcbSupport ? false
, glSupport ? false
, gobjectSupport ? true, glib , gobjectSupport ? true, glib
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null , zlib, libpng, pixman, libxcb ? null, xcbutil ? null, mesa ? null
, gettext, libiconvOrEmpty , gettext, libiconvOrEmpty
}: }:
assert postscriptSupport -> zlib != null; assert postscriptSupport -> zlib != null;
assert pngSupport -> libpng != null; assert pngSupport -> libpng != null;
assert xcbSupport -> libxcb != null && xcbutil != null; assert xcbSupport -> libxcb != null && xcbutil != null;
assert glSupport -> mesa != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cairo-1.12.4"; name = "cairo-1.12.4";
@ -23,6 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig x11 fontconfig xlibs.libXrender ] [ pkgconfig x11 fontconfig xlibs.libXrender ]
++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
++ stdenv.lib.optionals glSupport [ mesa ]
# On non-GNU systems we need GNU Gettext for libintl. # On non-GNU systems we need GNU Gettext for libintl.
++ stdenv.lib.optional (!stdenv.isLinux) gettext ++ stdenv.lib.optional (!stdenv.isLinux) gettext
@ -38,6 +41,7 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
[ "--enable-tee" ] [ "--enable-tee" ]
++ stdenv.lib.optional xcbSupport "--enable-xcb" ++ stdenv.lib.optional xcbSupport "--enable-xcb"
++ stdenv.lib.optional glSupport "--enable-gl"
++ stdenv.lib.optional pdfSupport "--enable-pdf"; ++ stdenv.lib.optional pdfSupport "--enable-pdf";
preConfigure = '' preConfigure = ''