alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #70841 from callahad/mariadb

Browse source 
mariadb: fix builds on darwin
This commit is contained in:
Dmitry Kalinkin 2019-10-10 22:58:28 -04:00 committed by GitHub
parent 3d860972ee b0b0bb7e0b
commit 1f9882cb29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/servers/sql/mariadb/default.nix
View file

@ -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 ++ [