diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2013-06-13 17:12:43 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2013-06-13 17:12:43 +0400 |
| commit | 19530856ed44248c8e14cfc6533b4001318e74d1 (patch) | |
| tree | c5c03ca92fdc6af84cffa33cfd4906846013443c /pkgs/development/libraries/cairo | |
| parent | ca67fccbfe867c7594e87b9f842dababbe3c7403 (diff) | |
| parent | 8fe0f0007bb84bafcf5f7209c12c779b24bec7f8 (diff) | |
| download | nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.gz nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.bz2 nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.lz nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.xz nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.zst nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.zip | |
Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/gtk+/2.x.nix pkgs/misc/ghostscript/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/cairo')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index a957a84c6a70..55a746890262 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -30,8 +30,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tee" ] ++ optional xcbSupport "--enable-xcb" ++ optional glSupport "--enable-gl" + ++ optional pdfSupport "--enable-pdf" ; + NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1"; + preConfigure = # On FreeBSD, `-ldl' doesn't exist. (stdenv.lib.optionalString stdenv.isFreeBSD @@ -40,7 +43,14 @@ stdenv.mkDerivation rec { cat "$i" | sed -es/-ldl//g > t mv t "$i" done - ''); + '') + + + '' + # 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' + ''; enableParallelBuilding = true; |