nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-15 20:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

libdeltachat: 2.59.0 -> 2.60.0

Browse Source 
Diff: https://github.com/chatmail/core/compare/v2.59.0...v2.60.0

Changelog: https://github.com/chatmail/core/blob/v2.60.0/CHANGELOG.md
This commit is contained in:
Robert Schütz
2026-09-11 14:56:00 -07:00
parent 3bf4840f86
commit 7d2ca47ef9
2 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/by-name/li/libdeltachat/no-static-lib.patch
View File

@@ -1,30 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5587e391..a18092f5 100644
index 435f5e75a..26377aac8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,6 @@ endif()
add_custom_command(
OUTPUT
- "${CMAKE_BINARY_DIR}/target/release/libdeltachat.a"
"${CMAKE_BINARY_DIR}/target/release/libdeltachat.${DYNAMIC_EXT}"
"${CMAKE_BINARY_DIR}/target/release/pkgconfig/deltachat.pc"
COMMAND
@@ -35,12 +34,10 @@ add_custom_target(
lib_deltachat
ALL
DEPENDS
- "${CMAKE_BINARY_DIR}/target/release/libdeltachat.a"
"${CMAKE_BINARY_DIR}/target/release/libdeltachat.${DYNAMIC_EXT}"
"${CMAKE_BINARY_DIR}/target/release/pkgconfig/deltachat.pc"
@@ -39,7 +39,6 @@ add_custom_target(
)
install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-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)
install(FILES "deltachat-ffi/deltachat.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-install(FILES "${CARGO_OUT_DIR}/libdeltachat.a" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(FILES "${CARGO_OUT_DIR}/libdeltachat.${DYNAMIC_EXT}" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(FILES "${CARGO_OUT_DIR}/pkgconfig/deltachat.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml
index d66cb00f..48347a48 100644
index 0e316d1a3..e09f6566d 100644
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -11,7 +11,7 @@ categories = ["cryptography", "std", "email"]
@@ -35,4 +22,4 @@ index d66cb00f..48347a48 100644
+crate-type = ["cdylib"]
[dependencies]
deltachat = { path = "../", default-features = false }
deltachat = { workspace = true, default-features = false }

6
pkgs/by-name/li/libdeltachat/package.nix
View File

@@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libdeltachat";
version = "2.59.0";
version = "2.60.0";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${finalAttrs.version}";
hash = "sha256-I0CZxuHVBQCbvMfaPUL+W1HU8plL7kKo53bSbUZskNE=";
hash = "sha256-NPOK5L17cR/2OYJ/wzhvy9Mf9lGjsEOfd27YBm3X1uc=";
};
patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "chatmail-core";
inherit (finalAttrs) version src;
hash = "sha256-oI/btypttMFLxAe2shYoLbHqwXMhlqzschORHoAQ/Wc=";
hash = "sha256-PSZzC3Z2HAjBrT2yIC3TYa8Z6FrxTuAOQO29nlbmaTI=";
};
nativeBuildInputs = [