Skip to content

Commit

Permalink
games-util/lutris: fix use of system wine
Browse files Browse the repository at this point in the history
Bug: https://bugs.gentoo.org/911245
Signed-off-by: Andrew Ammerlaan <[email protected]>
  • Loading branch information
Nowa-Ammerlaan committed Jul 29, 2023
1 parent 096b117 commit 3627403
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
22 changes: 22 additions & 0 deletions games-util/lutris/files/lutris-0.5.13-find-eselected-wine.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/lutris/util/wine/wine.py b/lutris/util/wine/wine.py
index f84584b..fa36d0c 100644
--- a/lutris/util/wine/wine.py
+++ b/lutris/util/wine/wine.py
@@ -19,7 +19,7 @@ WINE_PATHS = {
"winehq-devel": "/opt/wine-devel/bin/wine",
"winehq-staging": "/opt/wine-staging/bin/wine",
"wine-development": "/usr/lib/wine-development/wine",
- "system": "wine",
+ "system": "/etc/eselect/wine/bin/wine",
}

ESYNC_LIMIT_CHECK = os.environ.get("ESYNC_LIMIT_CHECK", "").lower()
@@ -273,7 +273,7 @@ def get_wine_version(wine_path="wine"):
return
if wine_path == "wine" and not system.find_executable("wine"):
return
- if os.path.isabs(wine_path):
+ if os.path.isabs(wine_path) and not os.path.islink(wine_path):
wine_stats = os.stat(wine_path)
if wine_stats.st_size < 2000:
# This version is a script, ignore it
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ distutils_enable_tests pytest

DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )

PATCHES=(
"${FILESDIR}/${P}-find-eselected-wine.patch"
)

python_test() {
virtx epytest
}
Expand Down

0 comments on commit 3627403

Please sign in to comment.