From 21bf5ef509dcadebab10de0ba142d55776a961f1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 May 2012 20:49:31 +0000 Subject: [PATCH] * Cairo updated to 1.12.2. svn path=/nixpkgs/branches/x-updates/; revision=34142 --- pkgs/development/libraries/cairo/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index fe3fe1e251ca..d3b51811a954 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -13,11 +13,11 @@ assert pngSupport -> libpng != null; assert xcbSupport -> libxcb != null && xcbutil != null; stdenv.mkDerivation rec { - name = "cairo-1.10.2"; + name = "cairo-1.12.2"; src = fetchurl { - url = "http://cairographics.org/releases/${name}.tar.gz"; - sha1 = "ccce5ae03f99c505db97c286a0c9a90a926d3c6e"; + url = "http://cairographics.org/releases/${name}.tar.xz"; + sha1 = "bc2ee50690575f16dab33af42a2e6cdc6451e3f9"; }; buildInputs = @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' ''; + enableParallelBuilding = true; + # The default `--disable-gtk-doc' is ignored. postInstall = "rm -rf $out/share/gtk-doc";