Skip to content

fix(mariadb plugin): wrap mysql/mariadb clients with project socket (#2522) #2930

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

Open
mikeland73 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(mariadb plugin): wrap mysql/mariadb clients with project socket (#2522) #2930

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
15 changes: 15 additions & 0 deletions plugins/mariadb/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,21 @@
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
fi

# Point the client binaries at the project's socket. Unlike the MySQL
# client, the MariaDB client does not honor the MYSQL_UNIX_PORT
# environment variable, so without this it falls back to its
# compile-time default (e.g. /run/mysqld/mysqld.sock).
# https://github.com/jetify-com/devbox/issues/2522
if [ -e "$out/bin/mysql" ]; then
wrapProgram "$out/bin/mysql" \
--add-flags '--socket=''$MYSQL_UNIX_PORT';
fi

if [ -e "$out/bin/mariadb" ]; then
wrapProgram "$out/bin/mariadb" \
--add-flags '--socket=''$MYSQL_UNIX_PORT';
fi

wrapProgram "$out/bin/mysql_install_db" \
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --basedir=''$MYSQL_BASEDIR';

Expand Down