diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-08 09:36:00 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-08 09:36:00 -0500 |
| commit | 6748534d83fa05cc6dee0f11bce543f7672b351f (patch) | |
| tree | a0d303182dd9e0c8ae149316270b732715e9ae64 /pkgs/servers/sql | |
| parent | 4f7cdd35d58e3d32ba576e218316b3c835bc508c (diff) | |
| parent | 3510b983c41196fce90729289c8c300ada1ccaea (diff) | |
| download | nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.gz nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.bz2 nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.lz nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.xz nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.tar.zst nixlib-6748534d83fa05cc6dee0f11bce543f7672b351f.zip | |
Merge remote-tracking branch 'upstream/master' into staging
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 63425fbb28c2..e22e3a64fac1 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 |