From 16c855b0cce1c93ec68b30964307f8f0168b33ac Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 22 Apr 2026 11:14:33 +0200
Subject: [PATCH 1/3] lomiri.lomiri-ui-toolkit: Fix FTBFS after qtbase changes

---
 .../lomiri/qml/lomiri-ui-toolkit/default.nix        | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
index 59375bf5a143..050a538c9dc1 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
@@ -131,13 +131,20 @@ stdenv.mkDerivation (finalAttrs: {
   + lib.optionalString (!withQt6) ''
     for subproject in po app-launch-profiler lomiri-ui-toolkit-launcher; do
       substituteInPlace $subproject/$subproject.pro \
-        --replace-fail "\''$\''$[QT_INSTALL_PREFIX]" "$out" \
-        --replace-warn "\''$\''$[QT_INSTALL_LIBS]" "$out/lib"
+        --replace-fail '$$[QT_INSTALL_PREFIX]' "$out"
     done
 
     # Install apicheck tool into bin
     substituteInPlace apicheck/apicheck.pro \
-      --replace-fail "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin"
+      --replace-fail '$$[QT_INSTALL_LIBS]/lomiri-ui-toolkit' "$out/bin"
+
+    substituteInPlace \
+      src/LomiriMetrics/LomiriMetrics.pro \
+      src/LomiriMetrics/lttng/lttng.pro \
+      --replace-fail '$$[QT_INSTALL_PLUGINS]' "$out/${qtbase.qtPluginPrefix}"
+
+    substituteInPlace features/lomiri_qml_plugin.prf \
+      --replace-fail '$$[QT_INSTALL_QML]' "$out/${qtbase.qtQmlPrefix}"
 
     substituteInPlace documentation/documentation.pro \
       --replace-fail '/usr/share/doc' '$$PREFIX/share/doc' \

From 74f0d69a4bc98f616c52fbe9f74dcab9a81d7090 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 22 Apr 2026 12:13:31 +0200
Subject: [PATCH 2/3] qdjango: Fix tests

Wants sqlite driver.
---
 pkgs/development/libraries/qdjango/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qdjango/default.nix b/pkgs/development/libraries/qdjango/default.nix
index 1105f2839325..d0f1a66b440a 100644
--- a/pkgs/development/libraries/qdjango/default.nix
+++ b/pkgs/development/libraries/qdjango/default.nix
@@ -5,6 +5,7 @@
   testers,
   doxygen,
   qmake,
+  qtbase,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -55,7 +56,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
-  preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
+  preCheck = ''
+    export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
     # at this point in the build, install_name for dylibs hasn't been patched yet so we need to set the library path.
     # for some reason, this doesn't work when just exporting the needed paths even though the autogenerated wrappers
     # should at most prepend paths? just patch them into the wrappers instead

From 5e238ea68de463401f7cc5242796bc52fbf46801 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 22 Apr 2026 13:51:13 +0200
Subject: [PATCH 3/3] lomiri-qt6.lomiri-ui-toolkit: Fix Qt 6.11 compatibility

---
 .../lomiri/qml/lomiri-ui-toolkit/default.nix         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
index 050a538c9dc1..4711cf27b81f 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
@@ -128,6 +128,18 @@ stdenv.mkDerivation (finalAttrs: {
       tests/unit/visual/tst_imageprovider.11.qml \
       --replace-fail '/usr/share' '${suru-icon-theme}/share'
   ''
+  # Adjust to Qt 6.11, TODO report & submit upstream
+  + lib.optionalString withQt6 ''
+    substituteInPlace apicheck/apicheck.cpp \
+      --replace-fail \
+        'attachedPropertiesType(QQmlEnginePrivate::get(currentEngine))' \
+        'attachedPropertiesType(QQmlTypeLoader::get(currentEngine))'
+
+    substituteInPlace src/LomiriToolkit/ucstylehints.cpp \
+      --replace-fail \
+        'QQmlEnginePrivate::getV4Engine(qmlEngine(this))' \
+        'qmlEngine(this)->handle()'
+  ''
   + lib.optionalString (!withQt6) ''
     for subproject in po app-launch-profiler lomiri-ui-toolkit-launcher; do
       substituteInPlace $subproject/$subproject.pro \