diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-04 11:33:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-04 11:33:47 -0400 |
| commit | 07786458619dd1f6b49e6d2e2af9fd2ae3dbc65e (patch) | |
| tree | a2681cb8db8e7092a69db3912c9f0618453459e5 | |
| parent | 760c9995b0601e8679d303ce5c301fdb33fb2c5d (diff) | |
| parent | e71d172982a60da167322e24f42d44adb74e327a (diff) | |
Merge pull request #51902 from Izorkin/mariadb-galera
mariadb.galera: 25.3.24 -> 25.3.26
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 767565dd5820..74637e13aa71 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -221,13 +221,13 @@ connector-c = stdenv.mkDerivation rec { galera = stdenv.mkDerivation rec { name = "mariadb-galera-${version}"; - version = "25.3.24"; + version = "25.3.26"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "1yx3rqy7r4w2l3hnrri30hvsa296v8xidi18p5fdzcpmnhnlwjbi"; + sha256 = "0fs0c1px9lknf1a5wwb12z1hj7j7b6hsfjddggikvkdkrnr2xs1f"; fetchSubmodules = true; }; @@ -243,9 +243,9 @@ galera = stdenv.mkDerivation rec { export LIBPATH="${galeraLibs}/lib" ''; - sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0"; + sconsFlags = "ssl=1 system_asio=0 strict_build_flags=0"; - postInstall = '' + installPhase = '' # copied with modifications from scripts/packages/freebsd.sh GALERA_LICENSE_DIR="$share/licenses/${name}" install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} |