diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-28 18:23:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-28 18:23:34 +0100 |
| commit | 72d120e7b60eab29cfa461898d125e9e92305d44 (patch) | |
| tree | 6d99a9792e0860a9a0a244b82db48817285f3fdd /pkgs | |
| parent | 05cb4dca11cd3971c0a2a33ac90fd0f871a24a39 (diff) | |
| parent | d71c8da8da526c0d8eea57d54c44cb5965c3eb77 (diff) | |
| download | nixlib-72d120e7b60eab29cfa461898d125e9e92305d44.tar nixlib-72d120e7b60eab29cfa461898d125e9e92305d44.tar.gz nixlib-72d120e7b60eab29cfa461898d125e9e92305d44.tar.bz2 nixlib-72d120e7b60eab29cfa461898d125e9e92305d44.tar.lz nixlib-72d120e7b60eab29cfa461898d125e9e92305d44.tar.xz nixlib-72d120e7b60eab29cfa461898d125e9e92305d44.tar.zst nixlib-72d120e7b60eab29cfa461898d125e9e92305d44.zip | |
Merge pull request #34345 from LnL7/darwin-mariadb
mariadb: fix connector-c library install_name on darwin
Diffstat (limited to 'pkgs')
| -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 ]; |