diff options
author | William A. Kennington III <william@wkennington.com> | 2015-10-30 17:16:07 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-10-30 17:16:07 -0700 |
commit | dd2de66d614e58a8b89046e2de73f2305df4b23f (patch) | |
tree | f89847bb63642613f543a44e4e270643f6c1c4b7 /pkgs/servers/sql/mariadb | |
parent | 99fe4f97c55185d3f51b759cbd5f8e3ab029eadb (diff) | |
parent | a7d573f224707185c44c92b8a35eb6a7ad62c552 (diff) | |
download | nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.gz nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.bz2 nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.lz nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.xz nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.zst nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/servers/sql/mariadb')
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ebb37aeddc69..c758ef882696 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, ncurses, zlib, xz, lzo, lz4, bzip2, snappy , openssl, pcre, boost, judy, bison, libxml2 , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl -, fixDarwinDylibNames +, fixDarwinDylibNames, cctools }: with stdenv.lib; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { (if stdenv.is64bit then snappy else null) pcre libxml2 boost judy bison libevent cracklib ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd numactl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools ]; patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch; @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1" "-DWITHOUT_TOKUDB=1" + "-DCURSES_LIBRARY=${ncurses}/lib/libncurses.dylib" ]; # fails to find lex_token.h sometimes @@ -100,6 +101,15 @@ stdenv.mkDerivation rec { mv $out/lib $lib mv $out/include $lib + '' + + stdenv.lib.optionalString stdenv.isDarwin '' + # Fix library rpaths + # TODO: put this in the stdenv to prepare for wide usage of multi-output derivations + for file in $(grep -rl $out/lib $lib); do + install_name_tool -delete_rpath $out/lib -add_rpath $lib $file + done + + '' + '' # Fix the mysql_config sed -i $out/bin/mysql_config \ -e 's,-lz,-L${zlib}/lib -lz,g' \ |