diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/development/libraries/cairo | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cairo')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/cairo/default.nix | 7 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch | 89 |
2 files changed, 94 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix index f6356ed0c81a..64d0e67b3f0f 100644 --- a/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, fetchpatch, pkgconfig, autoreconfHook +{ config, stdenv, lib, fetchurl, fetchpatch, pkgconfig, autoreconfHook, gtk-doc , pixman , zlibSupport ? true, zlib , pngSupport ? true, libpng @@ -46,6 +46,9 @@ in stdenv.mkDerivation rec { ./0002-gl-don-t-implicitly-include-X11-headers.patch ./0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch ./0004-util-don-t-build-cairo-sphinx-unless-PNG-enabled.patch + ] ++ optionals stdenv.hostPlatform.isDarwin [ + # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 + ./skip-configure-stderr-check.patch ]; outputs = [ "out" "dev" "devdoc" ]; @@ -53,8 +56,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook + gtk-doc pkgconfig - autoreconfHook ]; buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/nixpkgs/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch b/nixpkgs/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch new file mode 100644 index 000000000000..6deecf2a9717 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch @@ -0,0 +1,89 @@ +https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6 + +Comment 6 Jeremy Huddleston Sequoia 2014-07-15 04:12:40 UTC + +Yes, it is still an issue. We just disable the buggy '"x$cairo_cc_stderr" != "x"' logic, but that's not really a portable solution for you: + +diff -Naurp cairo-1.12.2.orig/configure cairo-1.12.2/configure +--- cairo-1.12.2.orig/configure 2012-04-29 11:49:59.000000000 -0700 ++++ cairo-1.12.2/configure 2012-05-03 11:23:49.000000000 -0700 +@@ -18044,7 +18044,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -18091,7 +18091,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -18161,7 +18161,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -18217,7 +18217,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -19663,7 +19663,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -19710,7 +19710,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -32692,7 +32692,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi + +@@ -32811,7 +32811,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false ; then + cairo_cc_flag=no + fi + +@@ -32892,7 +32892,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "x$cairo_cc_stderr" != "x"; then ++ if false; then + cairo_cc_flag=no + fi |