pangomm: update, so we can drop older cairo

This commit is contained in:
Vladimír Čunát 2013-12-10 17:12:32 +01:00
parent cb19931160
commit 1e113b8284
3 changed files with 8 additions and 93 deletions

View File

@ -1,86 +0,0 @@
{ postscriptSupport ? true
, pdfSupport ? true
, pngSupport ? true
, xcbSupport ? false
, gobjectSupport ? true, glib
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null
, libiconvOrEmpty, libintlOrEmpty
}:
assert postscriptSupport -> zlib != null;
assert pngSupport -> libpng != null;
assert xcbSupport -> libxcb != null && xcbutil != null;
stdenv.mkDerivation rec {
name = "cairo-1.12.2";
src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.xz";
sha1 = "bc2ee50690575f16dab33af42a2e6cdc6451e3f9";
};
buildInputs =
[ pkgconfig x11 fontconfig xlibs.libXrender ]
++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
++ libintlOrEmpty
++ libiconvOrEmpty;
propagatedBuildInputs =
[ freetype pixman ] ++
stdenv.lib.optional gobjectSupport glib ++
stdenv.lib.optional postscriptSupport zlib ++
stdenv.lib.optional pngSupport libpng;
NIX_CFLAGS_COMPILE = ( if stdenv.isDarwin
then "-I${pixman}/include/pixman-1"
else "" );
configureFlags =
[ "--enable-tee" ]
++ stdenv.lib.optional xcbSupport "--enable-xcb"
++ stdenv.lib.optional pdfSupport "--enable-pdf";
preConfigure = ''
# Work around broken `Requires.private' that prevents Freetype
# `-I' flags to be propagated.
sed -i "src/cairo.pc.in" \
-es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g'
''
# On FreeBSD, `-ldl' doesn't exist.
+ (stdenv.lib.optionalString stdenv.isFreeBSD
'' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in
do
cat "$i" | sed -es/-ldl//g > t
mv t "$i"
done
'');
enableParallelBuilding = true;
# The default `--disable-gtk-doc' is ignored.
postInstall = "rm -rf $out/share/gtk-doc";
meta = {
description = "A 2D graphics library with support for multiple output devices";
longDescription = ''
Cairo is a 2D graphics library with support for multiple output
devices. Currently supported output targets include the X
Window System, Quartz, Win32, image buffers, PostScript, PDF,
and SVG file output. Experimental backends include OpenGL
(through glitz), XCB, BeOS, OS/2, and DirectFB.
Cairo is designed to produce consistent output on all output
media while taking advantage of display hardware acceleration
when available (e.g., through the X Render Extension).
'';
homepage = http://cairographics.org/;
licenses = [ "LGPLv2+" "MPLv1" ];
platforms = stdenv.lib.platforms.all;
};
}

View File

@ -1,11 +1,15 @@
{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng, cairo }:
let
ver_maj = "2.34";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "pangomm-2.28.4";
name = "pangomm-${ver_maj}.${ver_min}";
src = fetchurl {
url = mirror://gnome/sources/pangomm/2.28/pangomm-2.28.4.tar.xz;
sha256 = "10kcdpg080m393f1vz0km41kd3483fkyabprm59gvjwklxkcp3bp";
url = "mirror://gnome/sources/pangomm/${ver_maj}/${name}.tar.xz";
sha256 = "0hcyvv7c5zmivprdam6cp111i6hn2y5jsxzk00m6j9pncbzvp0hf";
};
nativeBuildInputs = [ pkgconfig ];

View File

@ -4480,13 +4480,10 @@ let
glSupport = config.cairo.gl or (stdenv.isLinux &&
!stdenv.isArm && !stdenv.isMips);
};
cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { };
cairomm = callPackage ../development/libraries/cairomm { };
pango = callPackage ../development/libraries/pango { };
pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix {
cairo = cairo_1_12_2;
};
pangomm = callPackage ../development/libraries/pangomm { };
pangox_compat = callPackage ../development/libraries/pangox-compat { };