From f4df2160c9329b300095c603927901f445fb0d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 1 May 2022 06:25:23 +0000
Subject: [PATCH] libdeltachat: 1.77.0 -> 1.78.0

https://github.com/deltachat/deltachat-core-rust/blob/1.78.0/CHANGELOG.md
---
 .../instant-messengers/deltachat-desktop/default.nix   |  1 +
 .../deltachat-desktop/libdeltachat-darwin-dylib.patch} |  0
 pkgs/development/libraries/libdeltachat/default.nix    |  8 +++-----
 pkgs/development/python-modules/deltachat/default.nix  | 10 +++++++---
 4 files changed, 11 insertions(+), 8 deletions(-)
 rename pkgs/{development/libraries/libdeltachat/darwin-dylib.patch => applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch} (100%)

diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index 266f3958adf..009ece90b4c 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -31,6 +31,7 @@ let
       name = "${old.pname}-${version}";
       hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok=";
     };
+    patches = [ ./libdeltachat-darwin-dylib.patch ] ++ old.patches;
   });
   electronExec = if stdenv.isDarwin then
     "${electron_16}/Applications/Electron.app/Contents/MacOS/Electron"
diff --git a/pkgs/development/libraries/libdeltachat/darwin-dylib.patch b/pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch
similarity index 100%
rename from pkgs/development/libraries/libdeltachat/darwin-dylib.patch
rename to pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch
diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix
index 990a9e40960..b2d3f4c6bbb 100644
--- a/pkgs/development/libraries/libdeltachat/default.nix
+++ b/pkgs/development/libraries/libdeltachat/default.nix
@@ -16,25 +16,23 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.77.0";
+  version = "1.78.0";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-core-rust";
     rev = version;
-    hash = "sha256-SEsa83PQ2r3PBJuJhTMeje1n2mZUt/f61DvoVPwyxvs=";
+    hash = "sha256-SMobKC34RU7/LfRtgBxa8CHsLlWOQ29zaiw/V4+wWqU=";
   };
 
   patches = [
-    # https://github.com/deltachat/deltachat-core-rust/pull/2589
-    ./darwin-dylib.patch
     ./no-static-lib.patch
   ];
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-6srybgs1DGaE6iMrnRUWRnoQM00VCsZwMNdKQ2eqqxg=";
+    hash = "sha256-G2lUk1M3B+a3BaNPFWQgsYehUu7dyfuRc+fXSlWjSq4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix
index 381bcf66a5c..a342538d4ac 100644
--- a/pkgs/development/python-modules/deltachat/default.nix
+++ b/pkgs/development/python-modules/deltachat/default.nix
@@ -1,12 +1,14 @@
 { lib
 , buildPythonPackage
 , isPy27
+, pkg-config
+, pkgconfig
 , setuptools-scm
 , libdeltachat
 , cffi
-, imapclient
-, pluggy
+, imap-tools
 , requests
+, pluggy
 , setuptools
 , pytestCheckHook
 }:
@@ -19,6 +21,8 @@ buildPythonPackage rec {
   disabled = isPy27;
 
   nativeBuildInputs = [
+    pkg-config
+    pkgconfig
     setuptools-scm
   ];
 
@@ -30,7 +34,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     cffi
-    imapclient
+    imap-tools
     pluggy
     requests
     setuptools