public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2019-09-24 08:14:34 +02:00
parent 11c2b06dd2 afd04a49ed
commit eab41878ac
185 changed files with 5276 additions and 3825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/servers/sql/mariadb/default.nix
View File

@@ -3,7 +3,7 @@
, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
, fixDarwinDylibNames, cctools, CoreServices
, asio, buildEnv, check, scons
, less
, less, fetchpatch
, withoutClient ? false
}:
@@ -49,7 +49,12 @@ common = rec { # attributes common to both builds
patches = [
./cmake-includedir.patch
./cmake-libmariadb-includedir.patch
];
] ++ optional stdenv.hostPlatform.isDarwin (fetchpatch {
url = "https://github.com/MariaDB/mariadb-connector-c/commit/ee91b2c98a63acb787114dee4f2694e154630928.patch";
extraPrefix = "libmariadb/";
sha256 = "06i865zwyhs9fvrgmargzn09pbg1cmably3c4wifd241bj8ig8qk";
stripLen = 1;
});
cmakeFlags = [
"-DBUILD_CONFIG=mysql_release"