diff options
author | Félix Baylac-Jacqué <felix@alternativebit.fr> | 2018-05-05 16:46:27 +0200 |
---|---|---|
committer | Félix Baylac-Jacqué <felix@alternativebit.fr> | 2018-05-05 16:57:37 +0200 |
commit | c462aa070659925c449750a1921e00b9cae7fbf1 (patch) | |
tree | 51b22b9ded3b50a412c850cd8581841339822a5a /pkgs/servers/sql | |
parent | 7be2768a9c4ab16f5974538aa60fbe1766f1cdc9 (diff) | |
download | nixlib-c462aa070659925c449750a1921e00b9cae7fbf1.tar nixlib-c462aa070659925c449750a1921e00b9cae7fbf1.tar.gz nixlib-c462aa070659925c449750a1921e00b9cae7fbf1.tar.bz2 nixlib-c462aa070659925c449750a1921e00b9cae7fbf1.tar.lz nixlib-c462aa070659925c449750a1921e00b9cae7fbf1.tar.xz nixlib-c462aa070659925c449750a1921e00b9cae7fbf1.tar.zst nixlib-c462aa070659925c449750a1921e00b9cae7fbf1.zip |
maria-db: Fix mariadb_config include path.
Fixes #39984. Co-authored-by: Ekaitz Zarraga <ekaitz.zarraga@protonmail.com>
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/mariadb/include-dirs-path.patch | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a9de5508371a..170cc6c84a6a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -34,7 +34,7 @@ common = rec { # attributes common to both builds sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; - patches = [ ./cmake-includedir.patch ] + patches = [ ./cmake-includedir.patch ./include-dirs-path.patch ] ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch; cmakeFlags = [ diff --git a/pkgs/servers/sql/mariadb/include-dirs-path.patch b/pkgs/servers/sql/mariadb/include-dirs-path.patch new file mode 100644 index 000000000000..8d468cf546a4 --- /dev/null +++ b/pkgs/servers/sql/mariadb/include-dirs-path.patch @@ -0,0 +1,13 @@ +diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in +index 45d2f4e..e5666db 100644 +--- a/libmariadb/mariadb_config/mariadb_config.c.in ++++ b/libmariadb/mariadb_config/mariadb_config.c.in +@@ -5,7 +5,7 @@ + + static char *mariadb_progname; + +-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" ++#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mysql" + #define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@" + #define LIBS_SYS "@extra_dynamic_LDFLAGS@" + #define CFLAGS INCLUDE |