diff options
| author | Izorkin <izorkin@elven.pw> | 2019-05-19 15:15:32 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2019-06-04 19:02:16 +0300 |
| commit | a3da901ec7df21ff7dd1a72ed056efe26ce5d5db (patch) | |
| tree | c6d641428097b3df508fc8ace27632edf7146a98 /pkgs/servers/sql | |
| parent | c9d2d2fa824a7f02800e3eb490272596e7333970 (diff) | |
| download | nixlib-a3da901ec7df21ff7dd1a72ed056efe26ce5d5db.tar nixlib-a3da901ec7df21ff7dd1a72ed056efe26ce5d5db.tar.gz nixlib-a3da901ec7df21ff7dd1a72ed056efe26ce5d5db.tar.bz2 nixlib-a3da901ec7df21ff7dd1a72ed056efe26ce5d5db.tar.lz nixlib-a3da901ec7df21ff7dd1a72ed056efe26ce5d5db.tar.xz nixlib-a3da901ec7df21ff7dd1a72ed056efe26ce5d5db.tar.zst nixlib-a3da901ec7df21ff7dd1a72ed056efe26ce5d5db.zip | |
mariadb: 10.2.17 -> 10.3.15
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch | 16 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/include-dirs-path.patch | 13 |
3 files changed, 21 insertions, 16 deletions
diff --git a/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch b/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch new file mode 100644 index 000000000000..d2a4535f7ba9 --- /dev/null +++ b/pkgs/servers/sql/mariadb/cmake-plugin-includedir.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake +index 31291d26..fad52814 100644 +--- a/cmake/plugin.cmake ++++ b/cmake/plugin.cmake +@@ -34,6 +34,11 @@ MACRO(MYSQL_ADD_PLUGIN) + "LINK_LIBRARIES;DEPENDENCIES" + ${ARGN} + ) ++ ++ IF(WITHOUT_SERVER OR ARG_CLIENT) ++ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ++ ENDIF() ++ + IF(NOT WITHOUT_SERVER OR ARG_CLIENT) + + # Add common include directories diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 0eac14023644..00a2d28ac6c1 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -22,14 +22,14 @@ galeraLibs = buildEnv { }; common = rec { # attributes common to both builds - version = "10.2.17"; + version = "10.3.15"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "09xy6mgnz22mz8zgqlnddn8nzgs9xlz8lai4a7aa8x78in7hgcz7"; + sha256 = "0s399nxk2z8fgdr527p64y74zwjc3gpv7psf1n2r6ksl9njr3wr7"; name = "mariadb-${version}.tar.gz"; }; @@ -44,7 +44,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 ./include-dirs-path.patch ] + patches = [ ./cmake-includedir.patch ] ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch; cmakeFlags = [ @@ -100,6 +100,8 @@ client = stdenv.mkDerivation (common // { propagatedBuildInputs = [ openssl zlib ]; # required from mariadb.pc + patches = [ ./cmake-plugin-includedir.patch ]; + cmakeFlags = common.cmakeFlags ++ [ "-DWITHOUT_SERVER=ON" "-DWITH_WSREP=OFF" diff --git a/pkgs/servers/sql/mariadb/include-dirs-path.patch b/pkgs/servers/sql/mariadb/include-dirs-path.patch deleted file mode 100644 index 8d468cf546a4..000000000000 --- a/pkgs/servers/sql/mariadb/include-dirs-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 |