notes: fix build with qt 6.10
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
This commit is contained in:
@@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Based on https://github.com/nuttyartist/notes/pull/758 which doesn't apply cleanly
|
||||
./qt610-fix.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DUPDATE_CHECKER=OFF" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4380d39..1051cc5 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -74,6 +74,11 @@ if(USE_QT_VERSION STREQUAL "")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
+ # https://doc.qt.io/qt-6/whatsnew610.html#build-system-changes
|
||||
+ if(QT_VERSION VERSION_GREATER_EQUAL 6.10)
|
||||
+ list(APPEND QT_COMPONENTS CorePrivate GuiPrivate WidgetsPrivate)
|
||||
+ endif()
|
||||
+
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${QT_COMPONENTS})
|
||||
else()
|
||||
if(NOT USE_QT_VERSION STREQUAL "5" AND NOT USE_QT_VERSION STREQUAL "6")
|
||||
Reference in New Issue
Block a user