From db3a44c51fa22134a19f6b0735ddb9b752b2c980 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 14 Dec 2025 19:34:31 +0100 Subject: [PATCH] lomiri-qt6.lomiri-action-api: init at 1.2.1 --- pkgs/desktops/lomiri/default.nix | 5 +++- .../lomiri/qml/lomiri-action-api/default.nix | 29 +++++++++++++++---- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 73a1559fbf32..b1ab1a8b68e5 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -28,6 +28,10 @@ let lomiri-api = callPackage ./development/lomiri-api { }; #### QML / QML-related + lomiri-action-api = callPackage ./qml/lomiri-action-api { + # The dependency target "qmldoc" of target "doc" does not exist. + withDocumentation = !useQt6; + }; lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { }; lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { }; } @@ -63,7 +67,6 @@ let u1db-qt = callPackage ./development/u1db-qt { }; #### QML / QML-related - lomiri-action-api = callPackage ./qml/lomiri-action-api { }; lomiri-notifications = callPackage ./qml/lomiri-notifications { }; lomiri-push-qml = callPackage ./qml/lomiri-push-qml { }; lomiri-settings-components = callPackage ./qml/lomiri-settings-components { }; diff --git a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix index 97005ae77345..e327a297e33a 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, gitUpdater, testers, cmake, @@ -13,8 +14,12 @@ qtdeclarative, qttools, validatePkgConfig, + withDocumentation ? true, }: +let + withQt6 = lib.strings.versionAtLeast qtbase.version "6"; +in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-action-api"; version = "1.2.1"; @@ -26,9 +31,19 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-pwHvbiUvkAi7/XgpNfgrqcp3znFKSXlAAacB2XsHQkg="; }; + patches = [ + (fetchpatch { + name = "0001-lomiri-action-api-fix-qt6-unit-tests.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-action-api/-/commit/8fadb3d75938403aca2dc0e9392370c0d9b45c3e.patch"; + hash = "sha256-qqgFgw2YY6cPEbzGKI7r4fk/CgR9NRe1ZY2HUsKLNlo="; + }) + ]; + outputs = [ "out" "dev" + ] + ++ lib.optionals withDocumentation [ "doc" ]; @@ -46,11 +61,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - doxygen pkg-config qtdeclarative - qttools # qdoc validatePkgConfig + ] + ++ lib.optionals withDocumentation [ + doxygen + qttools # qdoc ]; buildInputs = [ @@ -64,9 +81,9 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6")) + (lib.cmakeBool "ENABLE_QT6" withQt6) (lib.cmakeBool "ENABLE_TESTING" finalAttrs.finalPackage.doCheck) - (lib.cmakeBool "GENERATE_DOCUMENTATION" true) + (lib.cmakeBool "GENERATE_DOCUMENTATION" withDocumentation) # Use vendored libhud2, TODO package libhud2 separately? (lib.cmakeBool "use_libhud2" false) ]; @@ -92,6 +109,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl3Only; teams = [ lib.teams.lomiri ]; platforms = lib.platforms.linux; - pkgConfigModules = [ "lomiri-action-qt-1" ]; + pkgConfigModules = [ + "lomiri-action-qt${lib.optionalString withQt6 "6"}-1" + ]; }; })