Compare commits

..

No commits in common. "224618963528dc6cc293f9acd660f9c837d86f17" and "403f27526dea7943ad92e479e35bf6c6ec35bec2" have entirely different histories.

4 changed files with 3 additions and 19 deletions

View File

@ -3,7 +3,7 @@
with pkgs; with pkgs;
mkShell { mkShell {
buildInputs = [ flutter hover androidenv.androidPkgs_9_0.androidsdk jdk ]; buildInputs = [ dart flutter androidenv.androidPkgs_9_0.androidsdk jdk ];
ANDROID_HOME = "${androidenv.androidPkgs_9_0.androidsdk}/libexec/android-sdk"; ANDROID_HOME = "${androidenv.androidPkgs_9_0.androidsdk}/libexec/android-sdk";
ANDROID_AVD_HOME = (toString ./.) + "/.android/avd"; ANDROID_AVD_HOME = (toString ./.) + "/.android/avd";

View File

@ -21,9 +21,7 @@ in mkShell {
mysqld --datadir="${data_dir}" --socket="${socket}" --skip-networking --skip-mysqlx & mysqld --datadir="${data_dir}" --socket="${socket}" --skip-networking --skip-mysqlx &
sleep 1 sleep 1
if [ ! -d ${data_dir} ]; then
mysql --socket="${socket}" -u root < ${sql_file} mysql --socket="${socket}" -u root < ${sql_file}
fi
alias mysql='mysql --socket="${socket}" -u root' alias mysql='mysql --socket="${socket}" -u root'
alias nuke='rm -rf ${data_dir}' alias nuke='rm -rf ${data_dir}'

View File

@ -22,10 +22,7 @@ in mkShell {
pg_ctl start -o "--unix_socket_directories=${data_dir} --listen_addresses='''" pg_ctl start -o "--unix_socket_directories=${data_dir} --listen_addresses='''"
fi fi
if [ ! -d ${data_dir} ]; then
psql -d postgres -f ${sql_file} psql -d postgres -f ${sql_file}
fi
alias psql='psql -d postgres' alias psql='psql -d postgres'
alias nuke='rm -rf ${data_dir}' alias nuke='rm -rf ${data_dir}'
''; '';

View File

@ -1,11 +0,0 @@
{ pkgs ? import <nixpkgs> { } }:
with pkgs;
mkShell {
buildInputs = [ python38 poetry ];
shellHook = ''
export LD_LIBRARY_PATH=${pkgs.stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH
unset SOURCE_DATE_EPOCH
'';
}