Skip to content

Commit b8dea89

Browse files
hoshinolinarbernon
authored andcommitted
proton: Preserve WINEDLLPATH entries from host environment
Link: #9420
1 parent 6ce3767 commit b8dea89

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

proton

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1543,7 +1543,10 @@ class Session:
15431543
ld_library_path = [g_proton.lib_dir + "x86_64-linux-gnu", g_proton.lib_dir + "aarch64-linux-gnu", g_proton.lib_dir + "i386-linux-gnu"]
15441544
prepend_to_env_str(self.env, ld_path_var, ':'.join(ld_library_path), ":")
15451545

1546-
self.env["WINEDLLPATH"] = ':'.join([g_proton.lib_dir + "vkd3d", g_proton.lib_dir + "wine"])
1546+
dllpaths = [g_proton.lib_dir + "vkd3d", g_proton.lib_dir + "wine"]
1547+
if "WINEDLLPATH" in os.environ:
1548+
dllpaths.append(os.environ["WINEDLLPATH"])
1549+
self.env["WINEDLLPATH"] = ':'.join(dllpaths)
15471550

15481551
self.env["GST_PLUGIN_SYSTEM_PATH_1_0"] = ':'.join([lib + "/gstreamer-1.0" for lib in ld_library_path])
15491552
self.env["WINE_GST_REGISTRY_DIR"] = g_compatdata.path("gstreamer-1.0/")

0 commit comments

Comments
 (0)