From 7802da5812ddb0d606c03f45cd4274c38dffe522 Mon Sep 17 00:00:00 2001
From: aware70 <7832566+aware70@users.noreply.github.com>
Date: Fri, 7 Nov 2025 16:34:58 -0600
Subject: [PATCH] supercell-wx: fix build for Qt 6.10

---
 pkgs/by-name/su/supercell-wx/package.nix            |  3 ++-
 .../su/supercell-wx/patches/fix-qt-6.10.patch       | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch

diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix
index 8bddcb3a20b1..587444f6e36b 100644
--- a/pkgs/by-name/su/supercell-wx/package.nix
+++ b/pkgs/by-name/su/supercell-wx/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ aware70 ];
   };
 
-  env.CXXFLAGS = "-Wno-error=restrict -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=stringop-overflow";
+  env.CXXFLAGS = "-Wno-error=restrict -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=stringop-overflow -DQT_NO_USE_NODISCARD_FILE_OPEN";
   env.GTEST_FILTER = "-${lib.concatStringsSep ":" gtestSkip}";
 
   doCheck = true;
@@ -104,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # These may be or already are submitted upstream {{{
     ./patches/explicit-link-aws-crt.patch # fix missing symbols from aws-crt-cpp
+    ./patches/fix-qt-6.10.patch
     # }}}
   ];
 
diff --git a/pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch b/pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch
new file mode 100644
index 000000000000..d58710225f2d
--- /dev/null
+++ b/pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch
@@ -0,0 +1,13 @@
+diff --git a/external/qt6ct.cmake b/external/qt6ct.cmake
+index 665b5368..9e6ed0e9 100644
+--- a/external/qt6ct.cmake
++++ b/external/qt6ct.cmake
+@@ -5,7 +5,7 @@ find_package(QT NAMES Qt6
+              COMPONENTS Gui Widgets
+              REQUIRED)
+ find_package(Qt${QT_VERSION_MAJOR}
+-             COMPONENTS Gui Widgets
++             COMPONENTS Gui Widgets WidgetsPrivate
+              REQUIRED)
+ 
+ #extract version from qt6ct.h