diff options
Diffstat (limited to 'pkgs/development/libraries/cairo/default.nix')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index a09903f7ea91..68ba7d1a9b26 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -11,11 +11,11 @@ assert glSupport -> mesa_noglu != null; with { inherit (stdenv.lib) optional optionals; }; stdenv.mkDerivation rec { - name = "cairo-1.12.14"; + name = "cairo-1.12.16"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.xz"; - sha256 = "04xcykglff58ygs0dkrmmnqljmpjwp2qgwcz8sijqkdpz7ix3l4n"; + sha256 = "0inqwsylqkrzcjivdirkjx5nhdgxbdc62fq284c3xppinfg9a195"; }; nativeBuildInputs = [ pkgconfig ] ++ libintlOrEmpty ++ libiconvOrEmpty; @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { ++ optional pdfSupport "--enable-pdf" ; - NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1"; - preConfigure = # On FreeBSD, `-ldl' doesn't exist. (stdenv.lib.optionalString stdenv.isFreeBSD @@ -56,7 +54,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # The default `--disable-gtk-doc' is ignored. - postInstall = "rm -rf $out/share/gtk-doc"; + postInstall = "rm -rf $out/share/gtk-doc" + + stdenv.lib.optionalString stdenv.isDarwin ('' + #newline + '' + glib.flattenInclude + ); meta = { description = "A 2D graphics library with support for multiple output devices"; |