opentrack: use fetchpatch

This commit is contained in:
Laurent Meunier 2024-10-23 12:41:21 +02:00
parent 3fb7bd4a3b
commit 988622f746
2 changed files with 5 additions and 25 deletions

View File

@ -1,24 +0,0 @@
From d501d7e0b237ed0c305525788b423d842ffa356d Mon Sep 17 00:00:00 2001
From: Francesco Zanini <francesco@zanini.me>
Date: Mon, 13 Nov 2023 08:59:42 +0100
Subject: [PATCH] Fix build for wine without wrapper
`connected_game` is only declared in a specific configuration.
---
proto-wine/ftnoir_protocol_wine.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/proto-wine/ftnoir_protocol_wine.cpp b/proto-wine/ftnoir_protocol_wine.cpp
index 75526c54a..c44cfc43b 100644
--- a/proto-wine/ftnoir_protocol_wine.cpp
+++ b/proto-wine/ftnoir_protocol_wine.cpp
@@ -137,7 +137,9 @@ module_status wine::initialize()
qDebug() << "proto/wine: shm success";
// display "waiting for game message" (overwritten once a game is detected)
+#ifndef OTR_WINE_NO_WRAPPER
connected_game = "waiting for game...";
+#endif
}
else {
qDebug() << "proto/wine: shm no success";

View File

@ -17,6 +17,7 @@
libevdev,
makeDesktopItem,
fetchurl,
fetchpatch,
}: let
version = "2023.3.0";
@ -41,7 +42,10 @@ in
patches = [
# https://github.com/opentrack/opentrack/pull/1754
./0001-fix-wine-no-wrapper.patch
(fetchpatch {
url = "https://github.com/opentrack/opentrack/commit/d501d7e0b237ed0c305525788b423d842ffa356d.patch";
hash = "sha256-XMGHV78vt/Xn3hS+4V//pqtsdBQCfJPjIXxfwtdXX+Q=";
})
];
nativeBuildInputs = [cmake pkg-config ninja copyDesktopItems];