60ee785
60ee7853bdfccd18811d82018acc15b27ae987f298a8660
7df06b6| Status | File | + | - |
|---|---|---|---|
| M |
crates/wanda-core/src/wemod/downloader.rs
|
3 | 2 |
| M |
crates/wanda-core/src/wemod/installer.rs
|
16 | 0 |
crates/wanda-core/src/wemod/downloader.rsmodified@@ -14,9 +14,10 @@ const WEMOD_DOWNLOAD_URL: &str = "https://api.wemod.com/client/download"; | |||
| 14 | /// Pinned WeMod version known to work on Linux with Wine/Proton | 14 | /// Pinned WeMod version known to work on Linux with Wine/Proton |
| 15 | /// Version 12.x has known compatibility issues (black window, renderer crashes) | 15 | /// Version 12.x has known compatibility issues (black window, renderer crashes) |
| 16 | /// See: https://community.wemod.com/t/wand-wemod-version-12-0-3-on-linux-proton-just-displays-a-black-window/373133 | 16 | /// See: https://community.wemod.com/t/wand-wemod-version-12-0-3-on-linux-proton-just-displays-a-black-window/373133 |
| 17 | -const WEMOD_LINUX_COMPATIBLE_VERSION: &str = "11.5.0"; | 17 | +/// Using 11.6.0 as it matches wemod-launcher and has better Cloudflare verification support |
| 18 | +const WEMOD_LINUX_COMPATIBLE_VERSION: &str = "11.6.0"; | ||
| 18 | const WEMOD_LINUX_COMPATIBLE_URL: &str = | 19 | const WEMOD_LINUX_COMPATIBLE_URL: &str = |
| 19 | - "https://storage-cdn.wemod.com/app/releases/stable/WeMod-11.5.0.exe"; | 20 | + "https://storage-cdn.wemod.com/app/releases/stable/WeMod-11.6.0.exe"; |
| 20 | 21 | ||
| 21 | /// Information about a WeMod release | 22 | /// Information about a WeMod release |
| 22 | #[derive(Debug, Clone)] | 23 | #[derive(Debug, Clone)] |
crates/wanda-core/src/wemod/installer.rsmodified@@ -45,6 +45,22 @@ impl<'a> WemodInstaller<'a> { | |||
| 45 | env.insert("PROTON_NO_ESYNC".to_string(), "1".to_string()); | 45 | env.insert("PROTON_NO_ESYNC".to_string(), "1".to_string()); |
| 46 | env.insert("PROTON_NO_FSYNC".to_string(), "1".to_string()); | 46 | env.insert("PROTON_NO_FSYNC".to_string(), "1".to_string()); |
| 47 | 47 | ||
| 48 | + // Pass display variables for GUI (required for WeMod installer) | ||
| 49 | + if let Ok(disp) = std::env::var("DISPLAY") { | ||
| 50 | + info!("Captured DISPLAY={}", disp); | ||
| 51 | + env.insert("DISPLAY".to_string(), disp); | ||
| 52 | + } else { | ||
| 53 | + warn!("DISPLAY not set in environment!"); | ||
| 54 | + } | ||
| 55 | + if let Ok(wayland_disp) = std::env::var("WAYLAND_DISPLAY") { | ||
| 56 | + info!("Captured WAYLAND_DISPLAY={}", wayland_disp); | ||
| 57 | + env.insert("WAYLAND_DISPLAY".to_string(), wayland_disp); | ||
| 58 | + } | ||
| 59 | + if let Ok(xdg_dir) = std::env::var("XDG_RUNTIME_DIR") { | ||
| 60 | + info!("Captured XDG_RUNTIME_DIR={}", xdg_dir); | ||
| 61 | + env.insert("XDG_RUNTIME_DIR".to_string(), xdg_dir); | ||
| 62 | + } | ||
| 63 | + | ||
| 48 | // Set Proton lib paths for finding dependencies | 64 | // Set Proton lib paths for finding dependencies |
| 49 | let proton_lib64 = self.proton.path.join("files/lib64"); | 65 | let proton_lib64 = self.proton.path.join("files/lib64"); |
| 50 | let proton_lib = self.proton.path.join("files/lib"); | 66 | let proton_lib = self.proton.path.join("files/lib"); |