lomiri-qt6.gmenuharness: init at 0.1.4

pkgs/desktops/lomiri/default.nix

@@ -25,6 +25,7 @@ let
       #### Development tools / libraries
       cmake-extras = callPackage ./development/cmake-extras { };
       deviceinfo = callPackage ./development/deviceinfo { };
+      gmenuharness = callPackage ./development/gmenuharness { };
       gsettings-qt = callPackage ./development/gsettings-qt { };
       lomiri-api = callPackage ./development/lomiri-api { };
       lomiri-app-launch = callPackage ./development/lomiri-app-launch { };
@@ -79,7 +80,6 @@ let
 
       #### Development tools / libraries
       geonames = callPackage ./development/geonames { };
-      gmenuharness = callPackage ./development/gmenuharness { };
       libusermetrics = callPackage ./development/libusermetrics { };
       qtmir = callPackage ./development/qtmir { };
       trust-store = callPackage ./development/trust-store { };

pkgs/desktops/lomiri/development/gmenuharness/1001-tests-Make-compatible-with-Qt6.patch

@@ -0,0 +1,103 @@
+From a3b724d7ef8e7b36e982e5cb6965017415f74926 Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Mon, 13 Apr 2026 21:03:26 +0200
+Subject: [PATCH 1/2] tests: Make compatible with Qt6
+
+---
+ CMakeLists.txt             | 22 ++++++++++++++++++++++
+ tests/CMakeLists.txt       | 15 ++-------------
+ tests/utils/CMakeLists.txt |  2 +-
+ 3 files changed, 25 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 41b6fb4..4bf0538 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,9 +7,16 @@ include(GNUInstallDirs)
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 ${COMMON_FLAGS} -fno-strict-aliasing -fvisibility-inlines-hidden -Wall -pedantic -Wextra")
+
++option(ENABLE_QT6 "Enable Qt6 build (only matters for tests)" OFF)
+ option(Werror "Treat warnings as errors" ON)
+ option(enable_tests "Build tests" ON)
+
++if (ENABLE_QT6)
++  set (QT_VERSION_MAJOR 6)
++else()
++  set (QT_VERSION_MAJOR 5)
++endif()
++
+ if(Werror)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+ endif()
+@@ -47,6 +54,21 @@ add_subdirectory(include)
+
+ # testing
+ if(${enable_tests})
++  find_package(QT NAMES Qt${QT_VERSION_MAJOR})
++  find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core DBus)
++
++  find_package(GMock REQUIRED)
++
++  set(LIBQTDBUSTEST_PC_SUFFIX "1")
++  if(ENABLE_QT6)
++    set(LIBQTDBUSTEST_PC_SUFFIX "qt6")
++  endif()
++
++  pkg_check_modules(
++    TEST_DEPENDENCIES
++    libqtdbustest-${LIBQTDBUSTEST_PC_SUFFIX}>=0.2 REQUIRED
++  )
++
+   enable_testing()
+   add_subdirectory(tests)
+ endif()
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 1fcdacd..0901107 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,18 +1,7 @@
+-find_package(GMock REQUIRED)
+-find_package(Qt5Core REQUIRED)
+-find_package(Qt5DBus REQUIRED)
+-
+-pkg_check_modules(
+-    TEST_DEPENDENCIES
+-    libqtdbustest-1>=0.2 REQUIRED
+-)
+-
+ include_directories(
+-    ${Qt5Core_INCLUDE_DIRS}
+-    ${Qt5DBus_INCLUDE_DIRS}
+     ${TEST_DEPENDENCIES_INCLUDE_DIRS}
+     "${CMAKE_SOURCE_DIR}/include"
+-) 
++)
+
+ add_subdirectory(functional)
+ add_subdirectory(utils)
+@@ -32,7 +21,7 @@ target_link_libraries(
+     test-main
+     ${GMENU_HARNESS}
+     ${TEST_DEPENDENCIES_LDFLAGS}
+-    Qt5::DBus
++    Qt::DBus
+ )
+
+ add_test(
+diff --git a/tests/utils/CMakeLists.txt b/tests/utils/CMakeLists.txt
+index 5d607b5..6f97df9 100644
+--- a/tests/utils/CMakeLists.txt
++++ b/tests/utils/CMakeLists.txt
+@@ -6,7 +6,7 @@ add_library(
+
+ target_link_libraries(
+     test-main
+-    Qt5::Core
++    Qt::Core
+     ${GTEST_LIBRARIES}
+ )
+
+-- 
+2.51.2
+

pkgs/desktops/lomiri/development/gmenuharness/default.nix

@@ -17,6 +17,9 @@
   qtbase,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gmenuharness";
   version = "0.1.4";
@@ -40,6 +43,9 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.com/ubports/development/core/gmenuharness/-/commit/42d04e0d484b3715e7b9935e3ef3e2fa6c33b409.patch";
       hash = "sha256-Gyk8TxIfEWsqL9CGymmnVA/Xj4/+J1PRNmWikNEcRJ8=";
     })
+
+    # https://gitlab.com/ubports/development/core/gmenuharness/-/merge_requests/9
+    ./1001-tests-Make-compatible-with-Qt6.patch
   ];
 
   postPatch = ''
@@ -60,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
     cmake-extras
     glib
     lomiri-api
-    qtbase
   ];
 
   nativeCheckInputs = [
@@ -71,10 +76,14 @@ stdenv.mkDerivation (finalAttrs: {
   checkInputs = [
     gtest
     libqtdbustest
+    qtbase
   ];
 
   cmakeFlags = [
-    "-Denable_tests=${lib.boolToString finalAttrs.finalPackage.doCheck}"
+    (lib.strings.cmakeBool "enable_tests" finalAttrs.finalPackage.doCheck)
+  ]
+  ++ lib.optionals finalAttrs.finalPackage.doCheck [
+    (lib.strings.cmakeBool "ENABLE_QT6" withQt6)
   ];
 
   dontWrapQtApps = true;