From 16c855b0cce1c93ec68b30964307f8f0168b33ac Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 22 Apr 2026 11:14:33 +0200 Subject: [PATCH] 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' \