libdeltachat: 1.77.0 -> 1.78.0
https://github.com/deltachat/deltachat-core-rust/blob/1.78.0/CHANGELOG.md
This commit is contained in:
parent
13a9006ec3
commit
f4df2160c9
|
@ -31,6 +31,7 @@ let
|
||||||
name = "${old.pname}-${version}";
|
name = "${old.pname}-${version}";
|
||||||
hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok=";
|
hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok=";
|
||||||
};
|
};
|
||||||
|
patches = [ ./libdeltachat-darwin-dylib.patch ] ++ old.patches;
|
||||||
});
|
});
|
||||||
electronExec = if stdenv.isDarwin then
|
electronExec = if stdenv.isDarwin then
|
||||||
"${electron_16}/Applications/Electron.app/Contents/MacOS/Electron"
|
"${electron_16}/Applications/Electron.app/Contents/MacOS/Electron"
|
||||||
|
|
|
@ -16,25 +16,23 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libdeltachat";
|
pname = "libdeltachat";
|
||||||
version = "1.77.0";
|
version = "1.78.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "deltachat";
|
owner = "deltachat";
|
||||||
repo = "deltachat-core-rust";
|
repo = "deltachat-core-rust";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-SEsa83PQ2r3PBJuJhTMeje1n2mZUt/f61DvoVPwyxvs=";
|
hash = "sha256-SMobKC34RU7/LfRtgBxa8CHsLlWOQ29zaiw/V4+wWqU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# https://github.com/deltachat/deltachat-core-rust/pull/2589
|
|
||||||
./darwin-dylib.patch
|
|
||||||
./no-static-lib.patch
|
./no-static-lib.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||||
inherit src;
|
inherit src;
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
hash = "sha256-6srybgs1DGaE6iMrnRUWRnoQM00VCsZwMNdKQ2eqqxg=";
|
hash = "sha256-G2lUk1M3B+a3BaNPFWQgsYehUu7dyfuRc+fXSlWjSq4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,12 +1,14 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, isPy27
|
, isPy27
|
||||||
|
, pkg-config
|
||||||
|
, pkgconfig
|
||||||
, setuptools-scm
|
, setuptools-scm
|
||||||
, libdeltachat
|
, libdeltachat
|
||||||
, cffi
|
, cffi
|
||||||
, imapclient
|
, imap-tools
|
||||||
, pluggy
|
|
||||||
, requests
|
, requests
|
||||||
|
, pluggy
|
||||||
, setuptools
|
, setuptools
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
}:
|
}:
|
||||||
|
@ -19,6 +21,8 @@ buildPythonPackage rec {
|
||||||
disabled = isPy27;
|
disabled = isPy27;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
pkg-config
|
||||||
|
pkgconfig
|
||||||
setuptools-scm
|
setuptools-scm
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -30,7 +34,7 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
cffi
|
cffi
|
||||||
imapclient
|
imap-tools
|
||||||
pluggy
|
pluggy
|
||||||
requests
|
requests
|
||||||
setuptools
|
setuptools
|
||||||
|
|
Loading…
Reference in a new issue