diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-01-29 13:48:25 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-01-29 14:55:14 +0100 |
| commit | ec77a957784e193af5bdd26a75066627a02a37f3 (patch) | |
| tree | 93554fc18a7a567de0c982768fc2ebc1492d1f9f /pkgs/development | |
| parent | 944171bcf31776aa63dbecaaf4dea7d7881dab7e (diff) | |
| download | nixpkgs-ec77a957784e193af5bdd26a75066627a02a37f3.tar nixpkgs-ec77a957784e193af5bdd26a75066627a02a37f3.tar.gz nixpkgs-ec77a957784e193af5bdd26a75066627a02a37f3.tar.bz2 nixpkgs-ec77a957784e193af5bdd26a75066627a02a37f3.tar.lz nixpkgs-ec77a957784e193af5bdd26a75066627a02a37f3.tar.xz nixpkgs-ec77a957784e193af5bdd26a75066627a02a37f3.tar.zst nixpkgs-ec77a957784e193af5bdd26a75066627a02a37f3.zip | |
cairo: update, use xcb by default (no longer experimental)
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index f079acd6616..4104f20c543 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,27 +1,26 @@ { postscriptSupport ? true , pdfSupport ? true , pngSupport ? true -, xcbSupport ? false +, xcbSupport ? true # no longer experimental since 1.12 , gobjectSupport ? true, glib , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs -, zlib, libpng, pixman, libxcb ? null, xcbutil ? null +, zlib, libpng, pixman , gettext, libiconvOrEmpty }: assert postscriptSupport -> zlib != null; assert pngSupport -> libpng != null; -assert xcbSupport -> libxcb != null && xcbutil != null; stdenv.mkDerivation rec { - name = "cairo-1.12.6"; + name = "cairo-1.12.10"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.xz"; - sha1 = "a383c6cb4495e18848ea43e1031c294aa9417a43"; + sha256 = "0fxh6i8bv6rvj6lxyss3p4ns6irvmdkgnx98yjfalv0g47piln7i"; }; - buildInputs = - [ pkgconfig x11 fontconfig xlibs.libXrender ] + buildInputs = with xlibs; + [ pkgconfig x11 fontconfig libXrender ] ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] # On non-GNU systems we need GNU Gettext for libintl. @@ -40,15 +39,9 @@ stdenv.mkDerivation rec { ++ 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' - '' - + preConfigure = # On FreeBSD, `-ldl' doesn't exist. - + (stdenv.lib.optionalString stdenv.isFreeBSD + (stdenv.lib.optionalString stdenv.isFreeBSD '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in do cat "$i" | sed -es/-ldl//g > t |