bs-manager: 1.5.3 -> 1.5.4

Also removed patch file as the relevant patch has been merged upstream and is available within this update

(cherry picked from commit 0ada9f41cf)
This commit is contained in:
Mistyttm
2025-09-01 10:56:46 +10:00
committed by github-actions[bot]
parent d6844007b5
commit 47364ef8f0
2 changed files with 4 additions and 49 deletions

View File

@@ -19,20 +19,15 @@
buildNpmPackage (finalAttrs: {
pname = "bs-manager";
version = "1.5.3";
version = "1.5.4";
src = fetchFromGitHub {
owner = "Zagrios";
repo = "bs-manager";
tag = "v${finalAttrs.version}";
hash = "sha256-thqz6sFmov5py7mUBYUC6ANBgjnNFC1hfLEsaxJVYu8=";
hash = "sha256-YitQjhnadQrpdBOV2CUedRNm/RW7/rpXtS9PJTa9kUU=";
};
patches = [
# https://github.com/Zagrios/bs-manager/pull/870
./use-steam-run-for-wine.patch
];
postPatch = ''
# don't search for resources in electron's resource directory, but our own
substituteInPlace src/main/services/utils.service.ts \
@@ -43,13 +38,13 @@ buildNpmPackage (finalAttrs: {
ln -s ${finalAttrs.passthru.depotdownloader}/bin/DepotDownloader assets/scripts/DepotDownloader
'';
npmDepsHash = "sha256-VsCbz7ImDnJ0tonVhA4lOPA0w//tqF4hLhrReLUqYI8=";
npmDepsHash = "sha256-3NMqYD7S4wYjwYuGJOmq2/C82qtG1mImsR4crjFLe30=";
extraNpmDeps = fetchNpmDeps {
name = "bs-manager-${finalAttrs.version}-extra-npm-deps";
inherit (finalAttrs) src;
sourceRoot = "${finalAttrs.src.name}/release/app";
hash = "sha256-JqDsv9kvYnbJdNwXN1EbppSrFVqr2cSnVhV2+8uw54g=";
hash = "sha256-UWsxty1kfxMr5fybtykrN2G+yiQ9dw/bbMwfcVLJgp4=";
};
makeCacheWritable = true;

View File

@@ -1,40 +0,0 @@
diff --git a/src/main/services/linux.service.ts b/src/main/services/linux.service.ts
index 7f92bed..5f12896 100644
--- a/src/main/services/linux.service.ts
+++ b/src/main/services/linux.service.ts
@@ -129,12 +129,7 @@ export class LinuxService {
return fs.pathExistsSync(protonPath) && fs.pathExistsSync(winePath);
}
- public async getWinePath(): Promise<string> {
- if (await this.isNixOS()) {
- // Use system wine for nixos
- return "wine";
- }
-
+ public getWinePath(): string {
if (!this.staticConfig.has("proton-folder")) {
throw new Error("proton-folder variable not set");
}
diff --git a/src/main/services/mods/bs-mods-manager.service.ts b/src/main/services/mods/bs-mods-manager.service.ts
index c842fda..60cc190 100644
--- a/src/main/services/mods/bs-mods-manager.service.ts
+++ b/src/main/services/mods/bs-mods-manager.service.ts
@@ -162,12 +162,15 @@ export class BsModsManagerService {
let winePath: string = "";
if (process.platform === "linux") {
const { error: winePathError, result: winePathResult } =
- await tryit(async () => this.linuxService.getWinePath());
+ tryit(() => this.linuxService.getWinePath());
if (winePathError) {
log.error(winePathError);
return false;
}
- winePath = `"${winePathResult}"`;
+
+ winePath = await this.linuxService.isNixOS()
+ ? `steam-run "${winePathResult}"`
+ : `"${winePathResult}"`;
const winePrefix = this.linuxService.getWinePrefixPath();
if (!winePrefix) {