pyrox.dev
Merge pull request #253532 from reckenrode/mariadb-odbc-connector-fix
mariadb-connector-odbc: fix build with clang 16 on Darwin
+8
-1
pkgs/development/libraries/unixODBCDrivers/default.nix
+8
-1
pkgs/development/libraries/unixODBCDrivers/default.nix
···
55
55
fetchSubmodules = true;
56
56
};
57
57
58
+
patches = [
59
+
# Fix `call to undeclared function 'sleep'` with clang 16
60
+
./mariadb-connector-odbc-unistd.patch
61
+
];
62
+
58
63
nativeBuildInputs = [ cmake ];
59
-
buildInputs = [ unixODBC openssl libiconv ];
64
+
buildInputs = [ unixODBC openssl libiconv zlib ]
65
+
++ lib.optionals stdenv.isDarwin [ libkrb5 ];
60
66
61
67
preConfigure = ''
62
68
# we don't want to build a .pkg
···
66
72
'';
67
73
68
74
cmakeFlags = [
75
+
"-DWITH_EXTERNAL_ZLIB=ON"
69
76
"-DODBC_LIB_DIR=${lib.getLib unixODBC}/lib"
70
77
"-DODBC_INCLUDE_DIR=${lib.getDev unixODBC}/include"
71
78
"-DWITH_OPENSSL=ON"
+12
pkgs/development/libraries/unixODBCDrivers/mariadb-connector-odbc-unistd.patch
+12
pkgs/development/libraries/unixODBCDrivers/mariadb-connector-odbc-unistd.patch
···
1
+
diff -ur a/test/use_result.c b/test/use_result.c
2
+
--- a/test/use_result.c 1969-12-31 19:00:01.000000000 -0500
3
+
+++ b/test/use_result.c 2023-09-05 00:08:12.979889343 -0400
4
+
@@ -23,6 +23,8 @@
5
+
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
6
+
*/
7
+
8
+
+#include <unistd.h>
9
+
+
10
+
#include "tap.h"
11
+
12
+
SQLINTEGER my_max_rows= 100;