Skip to content
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

Jump to bottom

Update star-citizen: 2.0.5 -> 2.1.0 #217

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Update star-citizen: 2.0.5 -> 2.1.0 #217

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: 11 additions & 4 deletions pkgs/star-citizen/default.nix
View file
Open in desktop
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.1.0";
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-h/mlOMzDzY0qvEtX6zHox/qlueJZ2IHToxYnTem/V9I=";
};

# 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