From d85a587fdd6aa031afa1dd1c71a8d4c518606464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 31 Jan 2013 21:50:30 +0100 Subject: [PATCH] cairo: minor bugfix update, depend on new pixman now --- pkgs/development/libraries/cairo/default.nix | 4 ++-- pkgs/development/libraries/pixman/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/pixman/default.nix diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 4104f20c543..694662e794d 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -12,11 +12,11 @@ assert postscriptSupport -> zlib != null; assert pngSupport -> libpng != null; stdenv.mkDerivation rec { - name = "cairo-1.12.10"; + name = "cairo-1.12.12"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.xz"; - sha256 = "0fxh6i8bv6rvj6lxyss3p4ns6irvmdkgnx98yjfalv0g47piln7i"; + sha256 = "06nq0pzk2hyknp8cy1xn12s7i18sfcs0r3xfalilg1yckrsr7xhl"; }; buildInputs = with xlibs; diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix new file mode 100644 index 00000000000..fd12ceb9fe8 --- /dev/null +++ b/pkgs/development/libraries/pixman/default.nix @@ -0,0 +1,18 @@ +{ fetchurl, stdenv, pkgconfig, perl }: + +stdenv.mkDerivation rec { + name = "pixman-0.28.2"; + + src = fetchurl { + url = "http://cairographics.org/releases/${name}.tar.gz"; + sha256 = "0mcvxd5gx3w1wzgph91l2vaiic91jmx7s01hi2igphyvd80ckyia"; + }; + + buildInputs = [ pkgconfig perl ]; + + meta = { + homepage = http://pixman.org; + description = "A low-level library for pixel manipulation"; + license = "MIT"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eec9d9e1789..be5e50d4def 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3944,7 +3944,10 @@ let atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; - cairo = callPackage ../development/libraries/cairo { }; + cairo = callPackage ../development/libraries/cairo { + pixman = pixman_cairo; # it's recommended to be in sync + }; + pixman_cairo = callPackage ../development/libraries/pixman { }; pango = callPackage ../development/libraries/pango/1.30.x.nix { };