From 7e26f86c73def7ad397e3d2b1efc4af860821a15 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 31 Mar 2025 14:27:32 +0200 Subject: [PATCH] lomiri.lomiri-action-api: 1.1.3 -> 1.2.0 --- .../lomiri/qml/lomiri-action-api/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix index 8493e89f8f15..fb36a96e6547 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-action-api"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-action-api"; - rev = finalAttrs.version; - hash = "sha256-JDcUq7qEp6Z8TjdNspIz4FE/euH+ytGWa4rSxy4voiU="; + tag = finalAttrs.version; + hash = "sha256-v/nU+e/8ny5ViUygnPnbn7Cc9i2B+olH5zJgUFCdsDA="; }; outputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Queries QMake for broken Qt variable: '/build/qtbase-/$(out)/$(qtQmlPrefix)' substituteInPlace qml/Lomiri/Action/CMakeLists.txt \ - --replace-fail 'exec_program(''${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR)' 'set(QT_IMPORTS_DIR "''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}")' + --replace-fail "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" # Fix section labels substituteInPlace documentation/qml/pages/* \ @@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ + (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6")) (lib.cmakeBool "ENABLE_TESTING" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "GENERATE_DOCUMENTATION" true) # Use vendored libhud2, TODO package libhud2 separately? @@ -84,13 +85,13 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Allow applications to export actions in various forms to the Lomiri Shell"; homepage = "https://gitlab.com/ubports/development/core/lomiri-action-api"; changelog = "https://gitlab.com/ubports/development/core/lomiri-action-api/-/blob/${finalAttrs.version}/ChangeLog"; - license = licenses.lgpl3Only; - maintainers = teams.lomiri.members; - platforms = platforms.linux; + license = lib.licenses.lgpl3Only; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; pkgConfigModules = [ "lomiri-action-qt-1" ]; }; })