diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 722e06d6b6f6..bb432e42e252 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -36,6 +36,7 @@ let # The dependency target "qmldoc" of target "doc" does not exist. withDocumentation = !useQt6; }; + lomiri-notifications = callPackage ./qml/lomiri-notifications { }; lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { }; lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { }; qqc2-suru-style = callPackage ./qml/qqc2-suru-style { }; @@ -89,7 +90,6 @@ let u1db-qt = callPackage ./development/u1db-qt { }; #### QML / QML-related - 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-notifications/default.nix b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix index fc64790d457e..70e941984eca 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, cmake, dbus, @@ -13,29 +12,20 @@ qtdeclarative, }: +let + withQt6 = lib.versions.major qtbase.version == "6"; +in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-notifications"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-notifications"; tag = finalAttrs.version; - hash = "sha256-rGs+MTt/Z+Gk3jSxU7tfNAUdypG/HJ4pDqvC+U722Eg="; + hash = "sha256-9K9+zS2MDqARTlGH2bu363ysrCg82D53sBkKiLSXBoI="; }; - patches = [ - # Remove when version > 1.3.2 - (fetchpatch { - name = "0001-lomiri-notifications-support-qt6-and-newer-lomiri-api.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-notifications/-/commit/55e9b61d2214edb31613d67fa66284acfa171dc5.patch"; - excludes = [ - "debian/*" - ]; - hash = "sha256-BURficKpFd15RyNFWyZ+hqxFHnIbv4krFpTARQ86Ykw="; - }) - ]; - postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" @@ -76,8 +66,9 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; cmakeFlags = [ + (lib.strings.cmakeBool "ENABLE_QT6" withQt6) # In case anything still depends on deprecated hints - (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) + (lib.strings.cmakeBool "ENABLE_UBUNTU_COMPAT" (!withQt6)) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;