From 543ab3ed81cee30788c2e91e5ced921482f65060 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 14 Aug 2024 18:30:35 +0200 Subject: [PATCH] lomiri.telephony-service: Fix build after fixed strictDeps CMake script expects qmake binary. We don't plan on using it because it gives garbage, just patch out the check for its presence. --- pkgs/desktops/lomiri/services/telephony-service/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/lomiri/services/telephony-service/default.nix b/pkgs/desktops/lomiri/services/telephony-service/default.nix index 4f432f51b741..6157322e7ea9 100644 --- a/pkgs/desktops/lomiri/services/telephony-service/default.nix +++ b/pkgs/desktops/lomiri/services/telephony-service/default.nix @@ -67,8 +67,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory + # Patch out failure if QMake is not found, since we don't use it substituteInPlace CMakeLists.txt \ - --replace "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}" + --replace "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}" \ + --replace-fail 'QMAKE_EXECUTABLE STREQUAL "QMAKE_EXECUTABLE-NOTFOUND"' 'FALSE' '' + lib.optionalString finalAttrs.finalPackage.doCheck '' substituteInPlace tests/common/dbus-services/CMakeLists.txt \