From 0003f76f9b29d92ce7acb8e3f35f3805c91687d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Feb 2011 17:57:00 +0000
Subject: * Cairo 1.10.2.

svn path=/nixpkgs/branches/x-updates/; revision=25819
---
 pkgs/development/libraries/cairo/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 5ca745614917..dfd7959339d0 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 =
@@ -38,6 +38,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";
 
-- 
cgit 1.4.1