* Sync with trunk.

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

pkgs/development/libraries/cairo/default.nix

@@ -8,27 +8,50 @@
 assert postscriptSupport -> zlib != null;
 assert pngSupport -> libpng != null;
 
-stdenv.mkDerivation {
-  name = "cairo-1.8.0";
+stdenv.mkDerivation rec {
+  name = "cairo-1.8.6";
   
   src = fetchurl {
-    url = http://cairographics.org/releases/cairo-1.8.0.tar.gz;
-    sha1 = "8a689ca47c24216f37bb8cabae21ff08a7f47899";
+    url = "http://cairographics.org/releases/${name}.tar.gz";
+    sha256 = "0d9mfwq7r66j85hqjcjavwbn7c8gdaqnahmmiyz5iwpc1jplg8wk";
   };
 
   buildInputs = [
-    pkgconfig x11 fontconfig freetype pixman libxcb xcbutil
+    pkgconfig x11 fontconfig pixman libxcb xcbutil
   ];
 
   propagatedBuildInputs =
+    [ freetype ] ++
     stdenv.lib.optional postscriptSupport zlib ++
     stdenv.lib.optional pngSupport libpng;
     
   configureFlags = ["--disable-static" "--enable-xcb"] ++
     stdenv.lib.optional pdfSupport "--enable-pdf";
 
+  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'
+  '';
+
   meta = {
     description = "A 2D graphics library with support for multiple output devices";
+
+    longDescription = ''
+      Cairo is a 2D graphics library with support for multiple output
+      devices.  Currently supported output targets include the X
+      Window System, Quartz, Win32, image buffers, PostScript, PDF,
+      and SVG file output.  Experimental backends include OpenGL
+      (through glitz), XCB, BeOS, OS/2, and DirectFB.
+
+      Cairo is designed to produce consistent output on all output
+      media while taking advantage of display hardware acceleration
+      when available (e.g., through the X Render Extension).
+    '';
+
     homepage = http://cairographics.org/;
+
+    licenses = [ "LGPLv2+" "MPLv1" ];
   };
 }