Skip to content

Commit

Permalink
Update star-citizen: 2.0.5 -> 2.0.6
Browse files Browse the repository at this point in the history
* Bump launcher version to 2.0.6

* Add work arround for a known javascript error when launching from an
  application. Details can be found on spectrum:
  https://robertsspaceindustries.com/spectrum/community/SC/forum/1/thread/upcoming-launcher-update-for-linux-users/5693728

* Set default dll override to disable menubuilding to prevent wine from
  creating uneeded desktop shortcuts

* Set environment variable `WINEDEBUG=-all` to reduce console debug
  messages
  • Loading branch information
LovingMelody committed Nov 6, 2024
1 parent 43f595b commit 81b850f
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions pkgs/star-citizen/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
useUmu ? false,
protonPath ? "${proton-ge-bin.steamcompattool}/",
protonVerbs ? ["waitforexitandrun"],
wineDllOverrides ? [],
wineDllOverrides ? ["winemenubuilder.exe=d"],
gameScopeEnable ? false,
gameScopeArgs ? [],
preCommands ? "",
Expand All @@ -28,11 +28,11 @@
}: let
inherit (lib.strings) concatStringsSep optionalString;
# Latest version can be found: https://install.robertsspaceindustries.com/rel/2/latest.yml
version = "2.0.5";
version = "2.0.6";
src = pkgs.fetchurl {
url = "https://install.robertsspaceindustries.com/rel/2/RSI%20Launcher-Setup-${version}.exe";
name = "RSI Launcher-Setup-${version}.exe";
hash = "sha256-NevMkWdXe3aKFUqBgI32nshp0qZ8c4nSJ1qdV3EGpGk=";
hash = "sha256-r/Ui523LcWaIE5DycH7YJcFQiHKmz1gxdXILBUqVQm4=";
};

# Powershell stub for star-citizen
Expand Down Expand Up @@ -63,6 +63,7 @@
export WINE_HIDE_NVIDIA_GPU=1
# AMD
export dual_color_blend_by_location="true"
export WINEDEBUG=-all
''
}
Expand Down Expand Up @@ -124,7 +125,13 @@
${gameScope} ${gamemode}/bin/gamemoderun umu-run "$RSI_LAUNCHER" "$@"
''
else ''
${gameScope} ${gamemode}/bin/gamemoderun wine ${wineFlags} "$RSI_LAUNCHER" "$@"
if [[ -t 1 ]]; then
${gameScope} ${gamemode}/bin/gamemoderun wine ${wineFlags} "$RSI_LAUNCHER" "$@"
else
export LOG_DIR=$(mktemp -d)
echo "Working arround known launcher error by outputting logs to $LOG_DIR"
${gameScope} ${gamemode}/bin/gamemoderun wine ${wineFlags} "$RSI_LAUNCHER" "$@" >"$LOG_DIR/RSIout" 2>"$LOG_DIR/RSIerr"
fi
wineserver -w
''
}
Expand Down

0 comments on commit 81b850f

Please sign in to comment.