diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-10-20 20:51:15 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-10-20 20:52:33 +0200 |
| commit | 8bdf7dc4abac2866b699ffb2d53f769a91355f25 (patch) | |
| tree | 244b52e9df5bf4dc64ba3e4291af90b2865a5942 | |
| parent | a24a33dbc82a5e29643c74147aaaf59bca679238 (diff) | |
| parent | 6529627e13b391e3d8bf1ee22f17380be091ccf9 (diff) | |
| download | nixpkgs-8bdf7dc4abac2866b699ffb2d53f769a91355f25.tar nixpkgs-8bdf7dc4abac2866b699ffb2d53f769a91355f25.tar.gz nixpkgs-8bdf7dc4abac2866b699ffb2d53f769a91355f25.tar.bz2 nixpkgs-8bdf7dc4abac2866b699ffb2d53f769a91355f25.tar.lz nixpkgs-8bdf7dc4abac2866b699ffb2d53f769a91355f25.tar.xz nixpkgs-8bdf7dc4abac2866b699ffb2d53f769a91355f25.tar.zst nixpkgs-8bdf7dc4abac2866b699ffb2d53f769a91355f25.zip | |
Merge #100886: cairo: fix build on darwin
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/cairo/skip-configure-stderr-check.patch | 89 |
2 files changed, 92 insertions, 0 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index a414191ac0d..3a7c63165b7 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -35,6 +35,9 @@ in stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch"; sha256 = "112hgrrsmcwxh1r52brhi5lksq4pvrz4xhkzcf2iqp55jl2pb7n1"; }) + ] ++ optionals stdenv.hostPlatform.isDarwin [ + # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 + ./skip-configure-stderr-check.patch ]; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch b/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch new file mode 100644 index 00000000000..6deecf2a971 --- /dev/null +++ b/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 |