diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
commit | 375bc8def7c17506bc10f3b6193635f05d5ccc40 (patch) | |
tree | 6af7662b245e7998bd18ae20d9e74922c489fb6d /pkgs/servers/sql/mariadb | |
parent | 2f75c6845981b38a698cf1a9f620145877c80956 (diff) | |
parent | 7f9ccc628403ed88844a4436da3b2944be5560a4 (diff) | |
download | nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.gz nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.bz2 nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.lz nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.xz nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.zst nixlib-375bc8def7c17506bc10f3b6193635f05d5ccc40.zip |
Merge staging into closure-size
Diffstat (limited to 'pkgs/servers/sql/mariadb')
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index f6c9d73aa8a1..e57404916756 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ncurses, openssl, pcre, boost, judy, bison, libxml2 +{ stdenv, fetchurl, cmake, ncurses, zlib, openssl, pcre, boost, judy, bison, libxml2 , libaio, libevent, groff, jemalloc, perl, fixDarwinDylibNames }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "04ckq67qgkghh7yzrbzwidk7wn7yjml15gzj2c5p1hs2k7lr9lww"; }; - buildInputs = [ cmake ncurses openssl pcre libxml2 boost judy bison libevent ] + buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ]; @@ -81,9 +81,10 @@ stdenv.mkDerivation rec { --replace basedir=\"\" basedir=\"$out\" # Remove superfluous files - rm -r $out/mysql-test $out/sql-bench $out/data + rm -r $out/mysql-test $out/sql-bench $out/data # Don't need testing data rm $out/share/man/man1/mysql-test-run.pl.1 - rm $out/bin/rcmysql + rm $out/bin/rcmysql # Not needed with nixos units + rm $out/bin/mysqlbug # Encodes a path to gcc and not really useful find $out/bin -name \*test\* -exec rm {} \; # Separate libs and includes into their own derivation @@ -91,6 +92,11 @@ stdenv.mkDerivation rec { mv $out/lib $lib mv $out/include $lib + # Fix the mysql_config + sed -i $out/bin/mysql_config \ + -e 's,-lz,-L${zlib}/lib -lz,g' \ + -e 's,-lssl,-L${openssl}/lib -lssl,g' + # Add mysql_config to libs since configure scripts use it mkdir -p $lib/bin cp $out/bin/mysql_config $lib/bin |