diff --git a/pkgs/desktops/lomiri/development/lomiri-api/default.nix b/pkgs/desktops/lomiri/development/lomiri-api/default.nix index cc10b36f2a7d..903e8da48645 100644 --- a/pkgs/desktops/lomiri/development/lomiri-api/default.nix +++ b/pkgs/desktops/lomiri/development/lomiri-api/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-api"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-api"; tag = finalAttrs.version; - hash = "sha256-ypz15XX0ESkOWI6G+a9/36bRg5gBG0X4Y/EvB/m7qm8="; + hash = "sha256-n9TlmmRRB618cXCOmo5CYqeMog7I7VxURN9mlDhljWw="; }; outputs = [ @@ -75,6 +75,10 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; + cmakeFlags = [ + (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6")) + ]; + env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; preBuild = '' @@ -98,6 +102,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lomiri API Library for integrating with the Lomiri shell"; homepage = "https://gitlab.com/ubports/development/core/lomiri-api"; + changelog = "https://gitlab.com/ubports/development/core/lomiri-api/-/blob/${ + if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + }/ChangeLog"; license = with lib.licenses; [ lgpl3Only gpl3Only diff --git a/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix index a01c8e80d988..387f2e456b0c 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, gitUpdater, cmake, dbus, @@ -23,6 +24,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-d3fJiYGAYF5e6XPuZ26Lrjj8tUiquunMLDLs9PdAYcA="; }; + patches = [ + # Remove when version > 1.3.1 + (fetchpatch { + name = "0001-lomiri-notifications-Properly-include-lomiri-shell-api-includedirs.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-notifications/-/commit/b68e51db6df1ed2637692dbff704374ab4c53fa7.patch"; + hash = "sha256-GWGlKQgOEy7HgzgA6H2Dmp0tB5amVcb3lj4LDT9dJCE="; + }) + ]; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix index e174ec60d954..36194fe15587 100644 --- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, gitUpdater, nixosTests, testers, @@ -48,6 +49,15 @@ stdenv.mkDerivation (finalAttrs: { "examples" ]; + patches = [ + # Remove when version > 2.2.2 + (fetchpatch { + name = "0001-lomiri-content-hub-Properly-include-lomiri-api-includedirs.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/commit/dab1854e5ec0a91fd28c9d84f06dcdd0af39518b.patch"; + hash = "sha256-aQB8kLL2ZkKUOvFoDQ9rottFsCSNJ66wUjUZxP+kr5k="; + }) + ]; + postPatch = '' substituteInPlace import/*/Content/CMakeLists.txt \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix index 85e05783d4fb..cd2dc035498a 100644 --- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, gitUpdater, testers, boost, @@ -43,6 +44,15 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withDocumentation [ "doc" ]; + patches = [ + # Remove when version > 0.3.0 + (fetchpatch { + name = "0001-lomiri-download-manager-Properly-include-lomiri-api-includedirs.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/b847aca92cea6f729b96f7a55f765ae4d9fbf741.patch"; + hash = "sha256-hx/b80P5nbonlP3B8ekjZjxUGV3Ofm/lai0RU1ak9Gs="; + }) + ]; + postPatch = '' # Substitute systemd's prefix in pkg-config call substituteInPlace CMakeLists.txt \