supercell-wx: fix build for Qt 6.10
This commit is contained in:
@@ -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
|
||||
# }}}
|
||||
];
|
||||
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user