ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge #100886: cairo: fix build on darwin

Browse Source
This commit is contained in:
Vladimír Čunát 2020-10-20 20:51:15 +02:00
commit 8bdf7dc4ab
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 92 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/cairo/default.nix
View File

@ -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" ];

89
pkgs/development/libraries/cairo/skip-configure-stderr-check.patch Normal file
View File

@ -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