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

mysql57: 5.7.20 -> 5.7.22

Browse Source 
Do not SKIP_BUILD_RPATH to let libmysql_api_test run during the build.

There is no WITH_UNITTEST, but there is WITH_UNIT_TESTS.

Do not install and immediately delete mysql-test.

There is no "basedir=" in mysql_install_db.
This commit is contained in:
Orivej Desh 2018-05-29 09:40:45 +00:00
parent 4b975f0fb9
commit 303a17a939
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/servers/sql/mysql/5.7.x.nix
View File

@ -6,11 +6,11 @@
let let
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
name = "mysql-${version}"; name = "mysql-${version}";
version = "5.7.20"; version = "5.7.22";
src = fetchurl { src = fetchurl {
url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
sha256 = "11v4g3igigv3zvknv67qml8in6fjrbs2vnr3q6bg6f62nydm95sk"; sha256 = "1wng15j5caz6fsv28avlcxjgq3c5n90ifk79xa0h7jws19dl1f2f";
}; };
preConfigure = stdenv.lib.optional stdenv.isDarwin '' preConfigure = stdenv.lib.optional stdenv.isDarwin ''
@ -26,14 +26,14 @@ self = stdenv.mkDerivation rec {
outputs = [ "out" "static" ]; outputs = [ "out" "static" ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build.
"-DWITH_SSL=yes" "-DWITH_SSL=yes"
"-DWITH_EMBEDDED_SERVER=yes" "-DWITH_EMBEDDED_SERVER=yes"
"-DWITH_UNITTEST=no" "-DWITH_UNIT_TESTS=no"
"-DWITH_ZLIB=yes" "-DWITH_ZLIB=yes"
"-DWITH_ARCHIVE_STORAGE_ENGINE=yes" "-DWITH_ARCHIVE_STORAGE_ENGINE=yes"
"-DWITH_BLACKHOLE_STORAGE_ENGINE=yes" "-DWITH_BLACKHOLE_STORAGE_ENGINE=yes"
"-DWITH_FEDERATED_STORAGE_ENGINE=yes" "-DWITH_FEDERATED_STORAGE_ENGINE=yes"
"-DCMAKE_VERBOSE_MAKEFILE=yes"
"-DHAVE_IPV6=yes" "-DHAVE_IPV6=yes"
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
"-DMYSQL_DATADIR=/var/lib/mysql" "-DMYSQL_DATADIR=/var/lib/mysql"
@ -45,6 +45,7 @@ self = stdenv.mkDerivation rec {
"-DINSTALL_DOCREADMEDIR=share/mysql" "-DINSTALL_DOCREADMEDIR=share/mysql"
"-DINSTALL_SUPPORTFILESDIR=share/mysql" "-DINSTALL_SUPPORTFILESDIR=share/mysql"
"-DINSTALL_MYSQLSHAREDIR=share/mysql" "-DINSTALL_MYSQLSHAREDIR=share/mysql"
"-DINSTALL_MYSQLTESTDIR="
"-DINSTALL_DOCDIR=share/mysql/docs" "-DINSTALL_DOCDIR=share/mysql/docs"
"-DINSTALL_SHAREDIR=share/mysql" "-DINSTALL_SHAREDIR=share/mysql"
]; ];
@ -53,13 +54,10 @@ self = stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
prePatch = '' prePatch = ''
sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake sed -i -e "s|/usr/bin/libtool|libtool|" cmake/merge_archives.cmake.in
''; '';
postInstall = '' postInstall = ''
sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db moveToOutput "lib/*.a" $static
install -vD $out/lib/*.a -t $static/lib
rm -r $out/mysql-test
rm $out/share/man/man1/mysql-test-run.pl.1 $out/lib/*.a
ln -s libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libmysqlclient_r${stdenv.hostPlatform.extensions.sharedLibrary} ln -s libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libmysqlclient_r${stdenv.hostPlatform.extensions.sharedLibrary}
''; '';