diff options
| author | Robert Schütz <nix@dotlambda.de> | 2022-05-01 06:25:23 +0000 |
|---|---|---|
| committer | Yt <raphael@megzari.com> | 2022-05-01 11:50:57 -0400 |
| commit | f4df2160c9329b300095c603927901f445fb0d12 (patch) | |
| tree | 5ee63053de64033a5b86677afdb0a710331c1a85 /pkgs/development/libraries/libdeltachat | |
| parent | 13a9006ec344c911a9f952bb75b3edd16ecea410 (diff) | |
libdeltachat: 1.77.0 -> 1.78.0
https://github.com/deltachat/deltachat-core-rust/blob/1.78.0/CHANGELOG.md
Diffstat (limited to 'pkgs/development/libraries/libdeltachat')
| -rw-r--r-- | pkgs/development/libraries/libdeltachat/darwin-dylib.patch | 53 | ||||
| -rw-r--r-- | pkgs/development/libraries/libdeltachat/default.nix | 8 |
2 files changed, 3 insertions, 58 deletions
diff --git a/pkgs/development/libraries/libdeltachat/darwin-dylib.patch b/pkgs/development/libraries/libdeltachat/darwin-dylib.patch deleted file mode 100644 index caa44a62a062d..0000000000000 --- a/pkgs/development/libraries/libdeltachat/darwin-dylib.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ed8020c..44ca43e7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,12 +2,20 @@ cmake_minimum_required(VERSION 3.16) - project(deltachat LANGUAGES C) - include(GNUInstallDirs) - -+if(APPLE) -+ set(DYNAMIC_EXT "dylib") -+elseif(UNIX) -+ set(DYNAMIC_EXT "so") -+else() -+ set(DYNAMIC_EXT "dll") -+endif() -+ - find_program(CARGO cargo) - - add_custom_command( - OUTPUT - "target/release/libdeltachat.a" -- "target/release/libdeltachat.so" -+ "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - COMMAND - PREFIX=${CMAKE_INSTALL_PREFIX} -@@ -32,11 +40,11 @@ add_custom_target( - ALL - DEPENDS - "target/release/libdeltachat.a" -- "target/release/libdeltachat.so" -+ "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - ) - - install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) --install(FILES "target/release/libdeltachat.so" DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -diff --git a/python/install_python_bindings.py b/python/install_python_bindings.py -index c8ed43e2..714c7e30 100755 ---- a/python/install_python_bindings.py -+++ b/python/install_python_bindings.py -@@ -24,7 +24,7 @@ - - print("running:", " ".join(cmd)) - subprocess.check_call(cmd) -- subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True) -+ subprocess.check_call("rm -rf build/ src/deltachat/*.so src/deltachat/*.dylib" , shell=True) - - if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild": - subprocess.check_call([ diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 990a9e40960e9..b2d3f4c6bbb16 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 = [ |