Robert Schütz 2 years ago committed by Yt
parent 13a9006ec3
commit f4df2160c9
  1. 1
      pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
  2. 0
      pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch
  3. 8
      pkgs/development/libraries/libdeltachat/default.nix
  4. 10
      pkgs/development/python-modules/deltachat/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"

@ -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 = [

@ -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

Loading…
Cancel
Save