57 lines
2.1 KiB
Diff
57 lines
2.1 KiB
Diff
From dd207a94bea4679948e37183fb6ad89c40dd79f1 Mon Sep 17 00:00:00 2001
|
|
From: Marcin Serwin <marcin@serwin.dev>
|
|
Date: Wed, 15 Oct 2025 15:18:48 +0000
|
|
Subject: [PATCH] pcsx2: fix build with Qt 6.10
|
|
|
|
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
|
|
---
|
|
pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch | 25 +++++++++++++++++++++++++
|
|
pkgs/by-name/pc/pcsx2/package.nix | 3 +++
|
|
2 files changed, 28 insertions(+)
|
|
create mode 100644 pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch
|
|
|
|
diff --git a/pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch b/pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch
|
|
new file mode 100644
|
|
index 0000000000000..06341689c4537
|
|
--- /dev/null
|
|
+++ b/pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch
|
|
@@ -0,0 +1,25 @@
|
|
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
|
|
+index 504b7a3..100a024 100644
|
|
+--- a/cmake/SearchForStuff.cmake
|
|
++++ b/cmake/SearchForStuff.cmake
|
|
+@@ -107,7 +107,7 @@ disable_compiler_warnings_for_target(cubeb)
|
|
+ disable_compiler_warnings_for_target(speex)
|
|
+
|
|
+ # Find the Qt components that we need.
|
|
+-find_package(Qt6 6.7.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
|
|
++find_package(Qt6 6.7.3 COMPONENTS CoreTools Core CorePrivate GuiTools Gui GuiPrivate WidgetsTools Widgets WidgetsPrivate LinguistTools REQUIRED)
|
|
+
|
|
+ if(WIN32)
|
|
+ add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)
|
|
+diff --git a/pcsx2-qt/CMakeLists.txt b/pcsx2-qt/CMakeLists.txt
|
|
+index a62df95..4883c64 100644
|
|
+--- a/pcsx2-qt/CMakeLists.txt
|
|
++++ b/pcsx2-qt/CMakeLists.txt
|
|
+@@ -266,6 +266,7 @@ target_link_libraries(pcsx2-qt PRIVATE
|
|
+ Qt6::Core
|
|
+ Qt6::Gui
|
|
+ Qt6::Widgets
|
|
++ Qt6::GuiPrivate
|
|
+ KDAB::kddockwidgets
|
|
+ )
|
|
+
|
|
diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix
|
|
index 16e9aeabf1f69..daddd2f377eb1 100644
|
|
--- a/pkgs/by-name/pc/pcsx2/package.nix
|
|
+++ b/pkgs/by-name/pc/pcsx2/package.nix
|
|
@@ -63,6 +63,9 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
|
./0000-define-rev.patch
|
|
|
|
./remove-cubeb-vendor.patch
|
|
+
|
|
+ # Based on https://github.com/PCSX2/pcsx2/commit/8dffc857079e942ca77b091486c20c3c6530e4ed which doesn't apply cleanly
|
|
+ ./fix-qt-6.10.patch
|
|
];
|
|
|
|
cmakeFlags = [
|