gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libdeltachat: 1.136.3 -> 1.140.2

Browse Source 
Diff: https://github.com/deltachat/deltachat-core-rust/compare/v1.136.3...v1.140.2

Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.140.2/CHANGELOG.md
This commit is contained in:
Robert Schütz
2024-06-19 07:13:32 -07:00
parent b60ebf54c1
commit b5b4eec6d1
3 changed files with 2052 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libdeltachat/Cargo.lock
Generated
+2036 -296
View File
File diff suppressed because it is too large Load Diff
pkgs/development/libraries/libdeltachat/default.nix
+2 -2
View File
@@ -31,13 +31,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.136.3";
version = "1.140.2";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-/ZWpPpxnOCLGswrfbEPvfUn1LpdBQeR5LecRAB0PEhI=";
hash = "sha256-BSbvgKiI89B+nxp5McBKTJAwgePt27C1QvSQLhTL7pQ=";
};
patches = [
pkgs/development/libraries/libdeltachat/no-static-lib.patch
+14 -14
View File
@@ -1,33 +1,33 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44ca43e7..8b6960dd 100644
index 5587e391..a18092f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,6 @@ find_program(CARGO cargo)
@@ -20,7 +20,6 @@ endif()
add_custom_command(
OUTPUT
- "target/release/libdeltachat.a"
"target/release/libdeltachat.${DYNAMIC_EXT}"
"target/release/pkgconfig/deltachat.pc"
- "${CMAKE_BINARY_DIR}/target/release/libdeltachat.a"
"${CMAKE_BINARY_DIR}/target/release/libdeltachat.${DYNAMIC_EXT}"
"${CMAKE_BINARY_DIR}/target/release/pkgconfig/deltachat.pc"
COMMAND
@@ -39,12 +38,10 @@ add_custom_target(
@@ -35,12 +34,10 @@ add_custom_target(
lib_deltachat
ALL
DEPENDS
- "target/release/libdeltachat.a"
"target/release/libdeltachat.${DYNAMIC_EXT}"
"target/release/pkgconfig/deltachat.pc"
- "${CMAKE_BINARY_DIR}/target/release/libdeltachat.a"
"${CMAKE_BINARY_DIR}/target/release/libdeltachat.${DYNAMIC_EXT}"
"${CMAKE_BINARY_DIR}/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.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-install(FILES "${CMAKE_BINARY_DIR}/target/${ARCH_DIR}/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES "${CMAKE_BINARY_DIR}/target/${ARCH_DIR}/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES "${CMAKE_BINARY_DIR}/target/${ARCH_DIR}/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml
index de0fbafe..120efec9 100644
index d66cb00f..48347a48 100644
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["cryptography", "std", "email"]
@@ -11,7 +11,7 @@ categories = ["cryptography", "std", "email"]
[lib]
name = "deltachat"