diff --git a/Dist/historical.nix b/Dist/historical.nix index e857410421..2c360c5cca 100644 --- a/Dist/historical.nix +++ b/Dist/historical.nix @@ -210,6 +210,7 @@ in { hasAssetsInOutput = !isVersionAtLeast "2.6.1" version; hasFFmpegPatch_e68a49aa5 = isVersionAtLeast "2.9.2" version; # with e68a49aa5, downloading *and running* FFmpeg finally works; TODO use FFmpeg from Nixpkgs since it's a stable version (4.4.1) hasMiscTypeCheckerPatch_6afb3be98 = isVersionAtLeast "2.6.2" version; + mainAppFilename = "EmuHawk.exe"; # for emuhawk-mono-wrapper launch script neededExtraManagedDeps = neededExtraManagedDepsApprox; needsLibGLVND = false; # true iff not using nixGL (i.e. on NixOS) AND using the OpenGL renderer (the default option) needsSDL = isVersionAtLeast "2.9.2" version; diff --git a/Dist/launch-scripts.nix b/Dist/launch-scripts.nix index f151696602..2e1b7c0be5 100644 --- a/Dist/launch-scripts.nix +++ b/Dist/launch-scripts.nix @@ -66,8 +66,9 @@ in writeShellScript "emuhawk-mono-wrapper" '' set -e - if [ ! -e "$BIZHAWK_HOME/EmuHawk.exe" ]; then - printf "no such file: %s\n" "$BIZHAWK_HOME/EmuHawk.exe" + mainAppPath="$BIZHAWK_HOME/${bizhawkAssemblies.hawkSourceInfo.mainAppFilename}" + if [ ! -e "$mainAppPath" ]; then + printf "no such file: %s\n" "$mainAppPath" exit 1 fi @@ -87,8 +88,7 @@ fi printf "(capturing output in %s/EmuHawkMono_last*.txt)\n" "$PWD" >&2 exec '${redirectOutputToFiles}' EmuHawkMono_laststdout.txt EmuHawkMono_laststderr.txt \ - '${lib.getBin bizhawkAssemblies.mono}/bin/mono' \ - "$BIZHAWK_HOME/EmuHawk.exe" --config=config.json "$@" + '${lib.getBin bizhawkAssemblies.mono}/bin/mono' "$mainAppPath" --config=config.json "$@" ''; in { inherit emuhawk;