* Latest Cairo / GTK.

svn path=/nixpkgs/branches/stdenv-updates/; revision=11692

pkgs/development/libraries/cairo/default.nix

@@ -2,27 +2,22 @@
 , pdfSupport ? true
 , pngSupport ? true
 , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
-, zlib, libpng
+, zlib, libpng, pixman
 }:
 
 assert postscriptSupport -> zlib != null;
 assert pngSupport -> libpng != null;
 
 stdenv.mkDerivation {
-  name = "cairo-1.4.14";
+  name = "cairo-1.6.4";
   
   src = fetchurl {
-    url = http://cairographics.org/releases/cairo-1.4.14.tar.gz;
-    sha256 = "15l87pzmlwbxk6m4102g2zln4drq0l32qs60ccs5bpmcnky2lqya";
+    url = http://cairographics.org/releases/cairo-1.6.4.tar.gz;
+    sha1 = "9d990fe39a125ceb07221623c237cd7015855d5c";
   };
 
-  patches = [
-    # http://bugs.freedesktop.org/show_bug.cgi?id=10989
-    ./isspace.patch
-  ];
-  
   buildInputs = [
-    pkgconfig x11 fontconfig freetype
+    pkgconfig x11 fontconfig freetype pixman
   ];
   
   propagatedBuildInputs =