Skip to content

mariadb: wrap mysqld with --basedir #15421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vcunat merged 1 commit into from
May 20, 2016
Merged

mariadb: wrap mysqld with --basedir #15421

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkgs/servers/sql/mariadb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, openssl, pcre, boost, judy, bison, libxml2
, libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl
, fixDarwinDylibNames, cctools, CoreServices
, makeWrapper
}:

with stdenv.lib;
Expand All @@ -19,6 +20,7 @@ stdenv.mkDerivation rec {
# temporary due to https://mariadb.atlassian.net/browse/MDEV-9000
(if stdenv.is64bit then snappy else null)
pcre libxml2 boost judy bison libevent cracklib
makeWrapper
] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd ]
++ stdenv.lib.optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ]
++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];
Expand Down Expand Up @@ -92,6 +94,10 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/mysql_install_db \
--replace basedir=\"\" basedir=\"$out\"

# Wrap mysqld with --basedir, but as last flag
wrapProgram $out/bin/mysqld
sed -i "s,\(^exec.*$\),\1 --basedir=$out,g" $out/bin/mysqld

# Remove superfluous files
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
Expand Down