git.iko.soy/typeable/nixpkgs
on master help sign in
cairo: fix build on darwin
commit6529627e13b391e3d8bf1ee22f17380be091ccf9 authorRyan Burns <rtburns@protonmail.com> dateSat 17 Oct 2020, 14:22 (6 years ago) parent1bae8e2
2 files changed+92
pkgs/development/libraries/cairo/default.nix+3 pkgs/development/libraries/cairo/skip-configure-stderr-check.patch+89
pkgs/development/libraries/cairo/default.nix+3
@@ -35,6 +35,9 @@ in stdenv.mkDerivation rec {
3535 url = "https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch";
3636 sha256 = "112hgrrsmcwxh1r52brhi5lksq4pvrz4xhkzcf2iqp55jl2pb7n1";
3737 })
38+ ] ++ optionals stdenv.hostPlatform.isDarwin [
39+ # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121
40+ ./skip-configure-stderr-check.patch
3841 ];
3942
4043 outputs = [ "out" "dev" "devdoc" ];
pkgs/development/libraries/cairo/skip-configure-stderr-check.patchnew file+89
@@ -0,0 +1,89 @@
1+https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6
2+
3+Comment 6 Jeremy Huddleston Sequoia 2014-07-15 04:12:40 UTC
4+
5+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:
6+
7+diff -Naurp cairo-1.12.2.orig/configure cairo-1.12.2/configure
8+--- cairo-1.12.2.orig/configure 2012-04-29 11:49:59.000000000 -0700
9++++ cairo-1.12.2/configure 2012-05-03 11:23:49.000000000 -0700
10+@@ -18044,7 +18044,7 @@ fi
11+ rm -f core conftest.err conftest.$ac_objext \
12+ conftest$ac_exeext conftest.$ac_ext
13+
14+- if test "x$cairo_cc_stderr" != "x"; then
15++ if false; then
16+ cairo_cc_flag=no
17+ fi
18+
19+@@ -18091,7 +18091,7 @@ fi
20+ rm -f core conftest.err conftest.$ac_objext \
21+ conftest$ac_exeext conftest.$ac_ext
22+
23+- if test "x$cairo_cc_stderr" != "x"; then
24++ if false; then
25+ cairo_cc_flag=no
26+ fi
27+
28+@@ -18161,7 +18161,7 @@ fi
29+ rm -f core conftest.err conftest.$ac_objext \
30+ conftest$ac_exeext conftest.$ac_ext
31+
32+- if test "x$cairo_cc_stderr" != "x"; then
33++ if false; then
34+ cairo_cc_flag=no
35+ fi
36+
37+@@ -18217,7 +18217,7 @@ fi
38+ rm -f core conftest.err conftest.$ac_objext \
39+ conftest$ac_exeext conftest.$ac_ext
40+
41+- if test "x$cairo_cc_stderr" != "x"; then
42++ if false; then
43+ cairo_cc_flag=no
44+ fi
45+
46+@@ -19663,7 +19663,7 @@ fi
47+ rm -f core conftest.err conftest.$ac_objext \
48+ conftest$ac_exeext conftest.$ac_ext
49+
50+- if test "x$cairo_cc_stderr" != "x"; then
51++ if false; then
52+ cairo_cc_flag=no
53+ fi
54+
55+@@ -19710,7 +19710,7 @@ fi
56+ rm -f core conftest.err conftest.$ac_objext \
57+ conftest$ac_exeext conftest.$ac_ext
58+
59+- if test "x$cairo_cc_stderr" != "x"; then
60++ if false; then
61+ cairo_cc_flag=no
62+ fi
63+
64+@@ -32692,7 +32692,7 @@ fi
65+ rm -f core conftest.err conftest.$ac_objext \
66+ conftest$ac_exeext conftest.$ac_ext
67+
68+- if test "x$cairo_cc_stderr" != "x"; then
69++ if false; then
70+ cairo_cc_flag=no
71+ fi
72+
73+@@ -32811,7 +32811,7 @@ fi
74+ rm -f core conftest.err conftest.$ac_objext \
75+ conftest$ac_exeext conftest.$ac_ext
76+
77+- if test "x$cairo_cc_stderr" != "x"; then
78++ if false ; then
79+ cairo_cc_flag=no
80+ fi
81+
82+@@ -32892,7 +32892,7 @@ fi
83+ rm -f core conftest.err conftest.$ac_objext \
84+ conftest$ac_exeext conftest.$ac_ext
85+
86+- if test "x$cairo_cc_stderr" != "x"; then
87++ if false; then
88+ cairo_cc_flag=no
89+ fi