diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-30 19:51:33 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-30 19:51:33 +0100 |
| commit | c9171e5a4c3e61f9afa0e3da3755712d1da5d693 (patch) | |
| tree | 89b09dee818b612c9c52fb92d79b7169f1202006 /pkgs/servers/sql/mariadb/default.nix | |
| parent | e851d53ceaf2cd48d0757c385626dd2040db0f12 (diff) | |
| parent | 078fc69425787c9ceebfa003add3c1d80e49560c (diff) | |
| download | nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.gz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.bz2 nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.lz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.xz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.zst nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1430035
Diffstat (limited to 'pkgs/servers/sql/mariadb/default.nix')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 91d288c6a9e4..88d2ae3d68a7 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -180,6 +180,11 @@ connector-c = stdenv.mkDerivation rec { "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" ]; + # The cmake setup-hook uses $out/lib by default, this is not the case here. + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb") + ''; + nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ openssl zlib ]; buildInputs = [ libiconv ]; |