public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cairo: minor bugfix update, depend on new pixman now

This commit is contained in:
Vladimír Čunát 2013-01-31 21:50:30 +01:00
parent 8bce732ad3
commit d85a587fdd
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/cairo/default.nix
View File

@ -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;

18
pkgs/development/libraries/pixman/default.nix Normal file
View File

@ -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";
};
}

5
pkgs/top-level/all-packages.nix
View File

@ -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 { };