From 660c96b6dfd2248175523e593f9b91ac91e9cddb Mon Sep 17 00:00:00 2001 From: Carles Pagès Date: Sun, 2 Dec 2012 12:25:29 +0100 Subject: Add support for gl backend to cairo. This is also needed for the Weston compositor. --- pkgs/development/libraries/cairo/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/cairo') diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index d21f303e7412..4a4810cbbe3c 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -2,15 +2,17 @@ , pdfSupport ? true , pngSupport ? true , xcbSupport ? false +, glSupport ? false , gobjectSupport ? true, glib , 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 }: assert postscriptSupport -> zlib != null; assert pngSupport -> libpng != null; assert xcbSupport -> libxcb != null && xcbutil != null; +assert glSupport -> mesa != null; stdenv.mkDerivation rec { name = "cairo-1.12.4"; @@ -23,6 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig x11 fontconfig xlibs.libXrender ] ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] + ++ stdenv.lib.optionals glSupport [ mesa ] # On non-GNU systems we need GNU Gettext for libintl. ++ stdenv.lib.optional (!stdenv.isLinux) gettext @@ -38,6 +41,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tee" ] ++ stdenv.lib.optional xcbSupport "--enable-xcb" + ++ stdenv.lib.optional glSupport "--enable-gl" ++ stdenv.lib.optional pdfSupport "--enable-pdf"; preConfigure = '' -- cgit 1.4.1