summary refs log tree commit diff
path: root/pkgs/development/libraries/cairo
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-04-23 10:48:10 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-04-23 10:48:10 +0000
commit319feed9427e1573ce2bf3bd5efd3459ebc61e3d (patch)
tree3dff449774e6e0985e936bd1075991286fb72a05 /pkgs/development/libraries/cairo
parent6aae26a1d8e6b5113aca17a36676737ddd57da8d (diff)
downloadnixlib-319feed9427e1573ce2bf3bd5efd3459ebc61e3d.tar
nixlib-319feed9427e1573ce2bf3bd5efd3459ebc61e3d.tar.gz
nixlib-319feed9427e1573ce2bf3bd5efd3459ebc61e3d.tar.bz2
nixlib-319feed9427e1573ce2bf3bd5efd3459ebc61e3d.tar.lz
nixlib-319feed9427e1573ce2bf3bd5efd3459ebc61e3d.tar.xz
nixlib-319feed9427e1573ce2bf3bd5efd3459ebc61e3d.tar.zst
nixlib-319feed9427e1573ce2bf3bd5efd3459ebc61e3d.zip
* Latest Cairo / GTK.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11692
Diffstat (limited to 'pkgs/development/libraries/cairo')
-rw-r--r--pkgs/development/libraries/cairo/default.nix15
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 1c91c2b06682..7f9701fe3dc3 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/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 =