1 files changed, 17 insertions, 10 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 3a82759df01..7f9701fe3dc 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -2,26 +2,33 @@
 , 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.6";
+  name = "cairo-1.6.4";
+  
   src = fetchurl {
-    url = http://cairographics.org/releases/cairo-1.4.6.tar.gz;
-    sha256 = "15l87pzmlwbxk6m4102g2zln4drq0l32qs60ccs5bpmcnky2lqya";
+    url = http://cairographics.org/releases/cairo-1.6.4.tar.gz;
+    sha1 = "9d990fe39a125ceb07221623c237cd7015855d5c";
   };
+
   buildInputs = [
-    pkgconfig x11 fontconfig freetype
-    (if pngSupport then libpng else null)
-  ];
-  propagatedBuildInputs = [
-    (if postscriptSupport then zlib else null)
-    (if pngSupport then libpng else null)
+    pkgconfig x11 fontconfig freetype pixman
   ];
+  
+  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/;
+  };
 }