diff options
Diffstat (limited to 'pkgs/development/libraries/cairo/default.nix')
-rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 5ca745614917..1e478b1c68d9 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -2,7 +2,7 @@ , pdfSupport ? true , pngSupport ? true , xcbSupport ? false -, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype +, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs , zlib, libpng, pixman, libxcb ? null, xcbutil ? null }: @@ -11,15 +11,15 @@ assert pngSupport -> libpng != null; assert xcbSupport -> libxcb != null && xcbutil != null; stdenv.mkDerivation rec { - name = "cairo-1.8.10"; + name = "cairo-1.10.2"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.gz"; - sha1 = "fd5e8ca82ff0e8542ea4c51612cad387f2a49df3"; + sha1 = "ccce5ae03f99c505db97c286a0c9a90a926d3c6e"; }; buildInputs = - [ pkgconfig x11 fontconfig pixman ] ++ + [ pkgconfig x11 fontconfig pixman xlibs.libXrender ] ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]; propagatedBuildInputs = @@ -28,8 +28,9 @@ stdenv.mkDerivation rec { stdenv.lib.optional pngSupport libpng; configureFlags = - stdenv.lib.optional xcbSupport "--enable-xcb" ++ - stdenv.lib.optional pdfSupport "--enable-pdf"; + [ "--enable-tee" ] + ++ stdenv.lib.optional xcbSupport "--enable-xcb" + ++ stdenv.lib.optional pdfSupport "--enable-pdf"; preConfigure = '' # Work around broken `Requires.private' that prevents Freetype @@ -38,6 +39,9 @@ stdenv.mkDerivation rec { -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' ''; + # The default `--disable-gtk-doc' is ignored. + postInstall = "rm -rf $out/share/gtk-doc"; + meta = { description = "A 2D graphics library with support for multiple output devices"; |