diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/sql/mariadb/default.nix')
-rw-r--r-- | nixpkgs/pkgs/servers/sql/mariadb/default.nix | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/default.nix index ac9772922ec..3ba4e367312 100644 --- a/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -23,14 +23,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.4.12"; + version = "10.4.14"; 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 = "0252b9rxxz1ljjv6ni0wwgy14j8qmmdd2sq0a65dslx2ib9y3wgy"; + sha256 = "1z469j39chq7d3dp39cljjbzcz0wl1g7rii85x46290jw1cwsbzr"; name = "mariadb-${version}.tar.gz"; }; @@ -72,6 +72,8 @@ common = rec { # attributes common to both builds "-DINSTALL_SUPPORTFILESDIR=share/doc/mysql" "-DINSTALL_MYSQLTESTDIR=OFF" "-DINSTALL_SQLBENCHDIR=OFF" + "-DINSTALL_PAMDIR=share/pam/lib/security" + "-DINSTALL_PAMDATADIR=share/pam/etc/security" "-DWITH_ZLIB=system" "-DWITH_SSL=system" @@ -94,7 +96,7 @@ common = rec { # attributes common to both builds rm "$out"/bin/{mariadb_config,mysql_config} rm -r $out/include rm -r $out/lib/pkgconfig - rm -r $out/share/{aclocal,pkgconfig} + rm -r $out/share/aclocal ''; enableParallelBuilding = true; @@ -126,10 +128,10 @@ client = stdenv.mkDerivation (common // { patches = common.patches ++ [ ./cmake-plugin-includedir.patch - ./cmake-without-plugin-auth-pam.patch ]; cmakeFlags = common.cmakeFlags ++ [ + "-DPLUGIN_AUTH_PAM=OFF" "-DWITHOUT_SERVER=ON" "-DWITH_WSREP=OFF" "-DINSTALL_MYSQLSHAREDIR=share/mysql-client" @@ -137,7 +139,7 @@ client = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' rm -r "$out"/share/doc - rm "$out"/bin/{mysqltest,mytop,wsrep_sst_rsync_wan} + rm "$out"/bin/{mysqltest,mytop} libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt}) rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}} mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt} @@ -160,12 +162,7 @@ server = stdenv.mkDerivation (common // { ++ optional stdenv.hostPlatform.isLinux linux-pam ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; - patches = common.patches ++ [ - # Disable build unused plugin pam_mariadb_mtr.so. See https://jira.mariadb.org/browse/MDEV-21654 - ./cmake-disable-auth-pam-testing.patch - ] ++ optionals stdenv.hostPlatform.isDarwin [ - ./cmake-without-plugin-auth-pam.patch - ]; + patches = common.patches; cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" @@ -191,6 +188,7 @@ server = stdenv.mkDerivation (common // { ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ "-DWITH_JEMALLOC=static" ] ++ optional stdenv.hostPlatform.isDarwin [ + "-DPLUGIN_AUTH_PAM=OFF" "-DWITHOUT_OQGRAPH=1" ]; @@ -205,6 +203,9 @@ server = stdenv.mkDerivation (common // { '' + optionalString withStorageMroonga '' mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString (!stdenv.hostPlatform.isDarwin) '' + mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security + mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security + rm -r "$out"/OFF sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster ''; |