From e61a9650eed57e17e54e0b04aede7ecebe87f787 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 20 Apr 2023 12:41:57 +0300 Subject: [PATCH] mauikit-calendar: fix missing dependency specification --- pkgs/applications/maui/default.nix | 2 +- .../maui/mauikit-calendar/add-akonadi-calendar.patch | 10 ++++++++++ .../default.nix} | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch rename pkgs/applications/maui/{mauikit-calendar.nix => mauikit-calendar/default.nix} (87%) diff --git a/pkgs/applications/maui/default.nix b/pkgs/applications/maui/default.nix index b91f13d12594..3f5d1d499af5 100644 --- a/pkgs/applications/maui/default.nix +++ b/pkgs/applications/maui/default.nix @@ -60,7 +60,7 @@ let # libraries mauikit = callPackage ./mauikit.nix { }; mauikit-accounts = callPackage ./mauikit-accounts.nix { }; - mauikit-calendar = callPackage ./mauikit-calendar.nix { }; + mauikit-calendar = callPackage ./mauikit-calendar { }; mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { }; mauikit-imagetools = callPackage ./mauikit-imagetools.nix { }; mauikit-texteditor = callPackage ./mauikit-texteditor.nix { }; diff --git a/pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch b/pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch new file mode 100644 index 000000000000..0feb15b615fe --- /dev/null +++ b/pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -89,6 +89,7 @@ set_package_properties(Qt5QuickCompiler PROPERTIES + find_package(MauiKit) + + find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) ++find_package(KF5AkonadiCalendar ${AKONADI_VERSION} CONFIG REQUIRED) + find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED) + find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED) + find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION} CONFIG REQUIRED) \ No newline at end of file diff --git a/pkgs/applications/maui/mauikit-calendar.nix b/pkgs/applications/maui/mauikit-calendar/default.nix similarity index 87% rename from pkgs/applications/maui/mauikit-calendar.nix rename to pkgs/applications/maui/mauikit-calendar/default.nix index 508319f1616d..e9ea61592c0d 100644 --- a/pkgs/applications/maui/mauikit-calendar.nix +++ b/pkgs/applications/maui/mauikit-calendar/default.nix @@ -6,6 +6,7 @@ , qtquickcontrols2 , akonadi , akonadi-contacts +, akonadi-calendar , calendarsupport , eventviews }: @@ -13,6 +14,8 @@ mkDerivation { pname = "mauikit-calendar"; + patches = [ ./add-akonadi-calendar.patch ]; + nativeBuildInputs = [ cmake extra-cmake-modules @@ -21,6 +24,7 @@ mkDerivation { buildInputs = [ akonadi akonadi-contacts + akonadi-calendar calendarsupport eventviews mauikit