File tree Expand file tree Collapse file tree 2 files changed +7
-8
lines changed
Expand file tree Collapse file tree 2 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -129,12 +129,7 @@ export class LinuxService {
129129 return fs . pathExistsSync ( protonPath ) && fs . pathExistsSync ( winePath ) ;
130130 }
131131
132- public async getWinePath ( ) : Promise < string > {
133- if ( await this . isNixOS ( ) ) {
134- // Use system wine for nixos
135- return "wine" ;
136- }
137-
132+ public getWinePath ( ) : string {
138133 if ( ! this . staticConfig . has ( "proton-folder" ) ) {
139134 throw new Error ( "proton-folder variable not set" ) ;
140135 }
Original file line number Diff line number Diff line change @@ -162,18 +162,22 @@ export class BsModsManagerService {
162162 let winePath : string = "" ;
163163 if ( process . platform === "linux" ) {
164164 const { error : winePathError , result : winePathResult } =
165- await tryit ( async ( ) => this . linuxService . getWinePath ( ) ) ;
165+ tryit ( ( ) => this . linuxService . getWinePath ( ) ) ;
166166 if ( winePathError ) {
167167 log . error ( winePathError ) ;
168168 return false ;
169169 }
170- winePath = `"${ winePathResult } "` ;
170+
171+ winePath = await this . linuxService . isNixOS ( )
172+ ? `steam-run "${ winePathResult } "`
173+ : `"${ winePathResult } "` ;
171174
172175 const winePrefix = this . linuxService . getWinePrefixPath ( ) ;
173176 if ( ! winePrefix ) {
174177 throw new CustomError ( "Could not find BSManager WINEPREFIX path" , "no-wineprefix" ) ;
175178 }
176179 env . WINEPREFIX = winePrefix ;
180+ Object . assign ( env , process . env ) ;
177181 }
178182
179183 return new Promise < boolean > ( resolve => {
You can’t perform that action at this time.
0 commit comments