* Latest GTK+, glib, ATK, Pango, FreeType, Cairo, Fontconfig.

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

1 files changed, 19 insertions, 7 deletions

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 3a82759df017..1c91c2b06682 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -9,19 +9,31 @@ assert postscriptSupport -> zlib != null;
 assert pngSupport -> libpng != null;
 
 stdenv.mkDerivation {
-  name = "cairo-1.4.6";
+  name = "cairo-1.4.14";
+  
   src = fetchurl {
-    url = http://cairographics.org/releases/cairo-1.4.6.tar.gz;
+    url = http://cairographics.org/releases/cairo-1.4.14.tar.gz;
     sha256 = "15l87pzmlwbxk6m4102g2zln4drq0l32qs60ccs5bpmcnky2lqya";
   };
+
+  patches = [
+    # http://bugs.freedesktop.org/show_bug.cgi?id=10989
+    ./isspace.patch
+  ];
+  
   buildInputs = [
     pkgconfig x11 fontconfig freetype
-    (if pngSupport then libpng else null)
-  ];
-  propagatedBuildInputs = [
-    (if postscriptSupport then zlib else null)
-    (if pngSupport then libpng else null)
   ];
+  
+  propagatedBuildInputs =
+    stdenv.lib.optional postscriptSupport zlib ++
+    stdenv.lib.optional pngSupport libpng;
+    
   configureFlags =
     (if pdfSupport then ["--enable-pdf"] else []);
+
+  meta = {
+    description = "A 2D graphics library with support for multiple output devices";
+    homepage = http://cairographics.org/;
+  };
 }