public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
Matthew Bauer
2018-05-08 09:36:00 -05:00
parent 4f7cdd35d5 3510b983c4
commit 6748534d83
317 changed files with 7440 additions and 6298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/sql/mariadb/default.nix
View File

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

13
pkgs/servers/sql/mariadb/include-dirs-path.patch Normal file
View File

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