Skip to content

fix: don't override wine lib or gstreamer paths if using sys-wine #4186

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

Open
mikayahlevi wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: don't override wine lib or gstreamer paths if using sys-wine #4186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91cbca4
fix: don't override wine lib or gstreamer paths if using sys-wine
mikayahlevi Nov 17, 2025
8bbb402
fix: don't set the PATH environment variable if you are using a wine …
mikayahlevi Nov 17, 2025
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
27 changes: 14 additions & 13 deletions bottles/backend/wine/winecommand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,19 +329,20 @@ def get_env(
]
gst_libs = ["lib/gstreamer-1.0", "lib32/gstreamer-1.0"]

for lib in runner_libs:
_path = os.path.join(runner_path, lib)
if os.path.exists(_path):
ld.append(_path)

# Embedded GStreamer environment variables
if not env.has("BOTTLES_USE_SYSTEM_GSTREAMER") and not return_steam_env:
gst_env_path = []
for lib in gst_libs:
if os.path.exists(os.path.join(runner_path, lib)):
gst_env_path.append(os.path.join(runner_path, lib))
if len(gst_env_path) > 0:
env.add("GST_PLUGIN_SYSTEM_PATH", ":".join(gst_env_path), override=True)
if not config.Runner.startswith("sys-"):
for lib in runner_libs:
_path = os.path.join(runner_path, lib)
if os.path.exists(_path):
ld.append(_path)

# Embedded GStreamer environment variables
if not env.has("BOTTLES_USE_SYSTEM_GSTREAMER") and not return_steam_env:
gst_env_path = []
for lib in gst_libs:
if os.path.exists(os.path.join(runner_path, lib)):
gst_env_path.append(os.path.join(runner_path, lib))
if len(gst_env_path) > 0:
env.add("GST_PLUGIN_SYSTEM_PATH", ":".join(gst_env_path), override=True)

# DXVK environment variables
if params.dxvk and not return_steam_env:
Expand Down
3 changes: 2 additions & 1 deletion bottles/backend/wine/wineserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ def is_alive(self):

env = os.environ.copy()
env["WINEPREFIX"] = bottle
env["PATH"] = f"{runner}/bin:{env['PATH']}"
if not config.Runner.startswith("sys-"):
env["PATH"] = f"{runner}/bin:{env['PATH']}"
res = subprocess.Popen(
"wineserver -w",
stdout=subprocess.PIPE,
Expand Down