summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Girol <symphorien@users.noreply.github.com>2022-01-01 23:00:58 +0000
committerGitHub <noreply@github.com>2022-01-01 23:00:58 +0000
commit480ba412425b210a7e4bacf496fccfea7b7db479 (patch)
treea5894c5d96235892088bd9a155eeed27938daea7
parent1850adff36d62794d0aa6af120cb5292bab9c982 (diff)
parenta92b06b02436d0778263f65fa42ab3841b9d58c0 (diff)
downloadnixpkgs-480ba412425b210a7e4bacf496fccfea7b7db479.tar
nixpkgs-480ba412425b210a7e4bacf496fccfea7b7db479.tar.gz
nixpkgs-480ba412425b210a7e4bacf496fccfea7b7db479.tar.bz2
nixpkgs-480ba412425b210a7e4bacf496fccfea7b7db479.tar.lz
nixpkgs-480ba412425b210a7e4bacf496fccfea7b7db479.tar.xz
nixpkgs-480ba412425b210a7e4bacf496fccfea7b7db479.tar.zst
nixpkgs-480ba412425b210a7e4bacf496fccfea7b7db479.zip
Merge pull request #152322 from chuangzhu/kalendar
kalendar: fix #152284 segfault and pim sources
-rw-r--r--pkgs/applications/office/kalendar/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/office/kalendar/default.nix b/pkgs/applications/office/kalendar/default.nix
index b941553cba3..fa8f686c5ee 100644
--- a/pkgs/applications/office/kalendar/default.nix
+++ b/pkgs/applications/office/kalendar/default.nix
@@ -30,6 +30,7 @@
 , calendarsupport
 
 , akonadi
+, akonadi-search
 , akonadi-contacts
 , akonadi-calendar-tools
 , kdepim-runtime
@@ -78,11 +79,17 @@ mkDerivation rec {
     eventviews
     calendarsupport
 
+    akonadi-search
     akonadi-contacts
     akonadi-calendar-tools
+    kdepim-runtime
   ];
 
-  propagatedUserEnvPkgs = [ akonadi kdepim-runtime ];
+  propagatedUserEnvPkgs = [ akonadi kdepim-runtime akonadi-search ];
+  postFixup = ''
+    wrapProgram "$out/bin/kalendar" \
+      --prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}"
+  '';
 
   meta = with lib; {
     description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)";