diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-10-10 22:58:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-10 22:58:28 -0400 |
| commit | 1f9882cb294074387487743effd5b220074f6523 (patch) | |
| tree | ab5525d484743c79ba91add5484adaa425aafc39 /pkgs/servers/sql | |
| parent | 3d860972eefe10e04b7994d85f88dc7aeb6db248 (diff) | |
| parent | b0b0bb7e0b2b12278de114683d34cdea1bfa4ceb (diff) | |
| download | nixlib-1f9882cb294074387487743effd5b220074f6523.tar nixlib-1f9882cb294074387487743effd5b220074f6523.tar.gz nixlib-1f9882cb294074387487743effd5b220074f6523.tar.bz2 nixlib-1f9882cb294074387487743effd5b220074f6523.tar.lz nixlib-1f9882cb294074387487743effd5b220074f6523.tar.xz nixlib-1f9882cb294074387487743effd5b220074f6523.tar.zst nixlib-1f9882cb294074387487743effd5b220074f6523.zip | |
Merge pull request #70841 from callahad/mariadb
mariadb: fix builds on darwin
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ebd9938f12f4..63ad6ce3b25a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -41,9 +41,6 @@ common = rec { # attributes common to both builds prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt - '' + optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace cmake/build_configurations/mysql_release.cmake \ - --replace "SET(PLUGIN_AUTH_PAM YES)" "" ''; patches = [ @@ -163,6 +160,8 @@ server = stdenv.mkDerivation (common // { patches = common.patches ++ [ ./cmake-without-client.patch + ] ++ optionals stdenv.isDarwin [ + ./cmake-without-plugin-auth-pam.patch ]; cmakeFlags = common.cmakeFlags ++ [ |