From 6309e3b7fc8bc3821cbf56f4dfa263b8fc0f42fe Mon Sep 17 00:00:00 2001 From: James Groom Date: Wed, 14 Feb 2024 16:20:02 +0000 Subject: [PATCH] Nix expr: Fix DiscoHawk launch script --- Dist/launch-scripts.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Dist/launch-scripts.nix b/Dist/launch-scripts.nix index 0a81a8df11..f151696602 100644 --- a/Dist/launch-scripts.nix +++ b/Dist/launch-scripts.nix @@ -100,11 +100,15 @@ in { exit 1 fi - if [ -z "$LD_LIBRARY_PATH" ]; then - export LD_LIBRARY_PATH="$BIZHAWK_HOME/dll" + if [ "$XDG_DATA_HOME" ]; then + BIZHAWK_DATA_HOME="$XDG_DATA_HOME" else - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$BIZHAWK_HOME/dll" + BIZHAWK_DATA_HOME="$HOME/.local/share" fi + export BIZHAWK_DATA_HOME="$BIZHAWK_DATA_HOME/emuhawk-monort-${hawkVersion}" + cd "$BIZHAWK_DATA_HOME" + + export MONO_PATH="$BIZHAWK_HOME/dll" ${lib.optionalString (!debugPInvokes) "# "}export MONO_LOG_LEVEL=debug MONO_LOG_MASK=dll # pass `--arg debugPInvokes true` to nix-build to enable exec '${lib.getBin bizhawkAssemblies.mono}/bin/mono' "$BIZHAWK_HOME/DiscoHawk.exe" "$@" '';