cairo: update, use xcb by default (no longer experimental)
This commit is contained in:
parent
944171bcf3
commit
ec77a95778
@ -1,27 +1,26 @@
|
|||||||
{ postscriptSupport ? true
|
{ postscriptSupport ? true
|
||||||
, pdfSupport ? true
|
, pdfSupport ? true
|
||||||
, pngSupport ? true
|
, pngSupport ? true
|
||||||
, xcbSupport ? false
|
, xcbSupport ? true # no longer experimental since 1.12
|
||||||
, 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
|
||||||
, 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;
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "cairo-1.12.6";
|
name = "cairo-1.12.10";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://cairographics.org/releases/${name}.tar.xz";
|
url = "http://cairographics.org/releases/${name}.tar.xz";
|
||||||
sha1 = "a383c6cb4495e18848ea43e1031c294aa9417a43";
|
sha256 = "0fxh6i8bv6rvj6lxyss3p4ns6irvmdkgnx98yjfalv0g47piln7i";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs = with xlibs;
|
||||||
[ pkgconfig x11 fontconfig xlibs.libXrender ]
|
[ pkgconfig x11 fontconfig libXrender ]
|
||||||
++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
|
++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
|
||||||
|
|
||||||
# On non-GNU systems we need GNU Gettext for libintl.
|
# On non-GNU systems we need GNU Gettext for libintl.
|
||||||
@ -40,15 +39,9 @@ stdenv.mkDerivation rec {
|
|||||||
++ stdenv.lib.optional xcbSupport "--enable-xcb"
|
++ stdenv.lib.optional xcbSupport "--enable-xcb"
|
||||||
++ stdenv.lib.optional pdfSupport "--enable-pdf";
|
++ stdenv.lib.optional pdfSupport "--enable-pdf";
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure =
|
||||||
# Work around broken `Requires.private' that prevents Freetype
|
|
||||||
# `-I' flags to be propagated.
|
|
||||||
sed -i "src/cairo.pc.in" \
|
|
||||||
-es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g'
|
|
||||||
''
|
|
||||||
|
|
||||||
# On FreeBSD, `-ldl' doesn't exist.
|
# On FreeBSD, `-ldl' doesn't exist.
|
||||||
+ (stdenv.lib.optionalString stdenv.isFreeBSD
|
(stdenv.lib.optionalString stdenv.isFreeBSD
|
||||||
'' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in
|
'' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in
|
||||||
do
|
do
|
||||||
cat "$i" | sed -es/-ldl//g > t
|
cat "$i" | sed -es/-ldl//g > t
|
||||||
|
Loading…
Reference in New Issue
Block a user