From 708cb74f752def0ebebcb761be07bc759d224d9a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 17 Apr 2026 21:16:44 +0200
Subject: [PATCH] lomiri-qt6.gmenuharness: init at 0.1.5

---
 pkgs/desktops/lomiri/default.nix                       |  2 +-
 .../lomiri/development/gmenuharness/default.nix        | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index f86933d9a238..7fb27d2d29c1 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -26,6 +26,7 @@ let
       cmake-extras = callPackage ./development/cmake-extras { };
       deviceinfo = callPackage ./development/deviceinfo { };
       geonames = callPackage ./development/geonames { };
+      gmenuharness = callPackage ./development/gmenuharness { };
       gsettings-qt = callPackage ./development/gsettings-qt { };
       lomiri-api = callPackage ./development/lomiri-api { };
       lomiri-app-launch = callPackage ./development/lomiri-app-launch { };
@@ -80,7 +81,6 @@ let
       lomiri-session = callPackage ./data/lomiri-session { };
 
       #### Development tools / libraries
-      gmenuharness = callPackage ./development/gmenuharness { };
       libusermetrics = callPackage ./development/libusermetrics { };
       qtmir = callPackage ./development/qtmir { };
       trust-store = callPackage ./development/trust-store { };
diff --git a/pkgs/desktops/lomiri/development/gmenuharness/default.nix b/pkgs/desktops/lomiri/development/gmenuharness/default.nix
index 4098a12e7828..21c02f1962b3 100644
--- a/pkgs/desktops/lomiri/development/gmenuharness/default.nix
+++ b/pkgs/desktops/lomiri/development/gmenuharness/default.nix
@@ -16,6 +16,9 @@
   qtbase,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gmenuharness";
   version = "0.1.5";
@@ -43,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
     cmake-extras
     glib
     lomiri-api
-    qtbase
   ];
 
   nativeCheckInputs = [
@@ -54,10 +56,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;