Merge pull request #70841 from callahad/mariadb
mariadb: fix builds on darwin
This commit is contained in:
@@ -41,9 +41,6 @@ common = rec { # attributes common to both builds
|
|||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
|
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 = [
|
patches = [
|
||||||
@@ -163,6 +160,8 @@ server = stdenv.mkDerivation (common // {
|
|||||||
|
|
||||||
patches = common.patches ++ [
|
patches = common.patches ++ [
|
||||||
./cmake-without-client.patch
|
./cmake-without-client.patch
|
||||||
|
] ++ optionals stdenv.isDarwin [
|
||||||
|
./cmake-without-plugin-auth-pam.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = common.cmakeFlags ++ [
|
cmakeFlags = common.cmakeFlags ++ [
|
||||||
|
|||||||
Reference in New Issue
Block a user