libdeltachat: don't build static lib
This commit is contained in:
parent
734e2b7b11
commit
4d9ddc3eeb
2 changed files with 40 additions and 0 deletions
|
@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
|
||||||
url = "https://github.com/deltachat/deltachat-core-rust/commit/408467e85d04fbbfd6bed5908d84d9e995943487.patch";
|
url = "https://github.com/deltachat/deltachat-core-rust/commit/408467e85d04fbbfd6bed5908d84d9e995943487.patch";
|
||||||
sha256 = "1j2ywaazglgl6370js34acrg0wrh0b7krqg05dfjf65n527lzn59";
|
sha256 = "1j2ywaazglgl6370js34acrg0wrh0b7krqg05dfjf65n527lzn59";
|
||||||
})
|
})
|
||||||
|
./no-static-lib.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||||
|
|
39
pkgs/development/libraries/libdeltachat/no-static-lib.patch
Normal file
39
pkgs/development/libraries/libdeltachat/no-static-lib.patch
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index fe7abe08..acdbe0d6 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -13,7 +13,6 @@ find_program(CARGO cargo)
|
||||||
|
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT
|
||||||
|
- "target/release/libdeltachat.a"
|
||||||
|
"target/release/libdeltachat.${DYNAMIC_EXT}"
|
||||||
|
"target/release/pkgconfig/deltachat.pc"
|
||||||
|
COMMAND
|
||||||
|
@@ -38,13 +37,11 @@ add_custom_target(
|
||||||
|
lib_deltachat
|
||||||
|
ALL
|
||||||
|
DEPENDS
|
||||||
|
- "target/release/libdeltachat.a"
|
||||||
|
"target/release/libdeltachat.${DYNAMIC_EXT}"
|
||||||
|
"target/release/pkgconfig/deltachat.pc"
|
||||||
|
)
|
||||||
|
|
||||||
|
include(GNUInstallDirs)
|
||||||
|
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)
|
||||||
|
diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml
|
||||||
|
index a34a27ba..cf354abb 100644
|
||||||
|
--- a/deltachat-ffi/Cargo.toml
|
||||||
|
+++ b/deltachat-ffi/Cargo.toml
|
||||||
|
@@ -12,7 +12,7 @@ categories = ["cryptography", "std", "email"]
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
name = "deltachat"
|
||||||
|
-crate-type = ["cdylib", "staticlib"]
|
||||||
|
+crate-type = ["cdylib"]
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
deltachat = { path = "../", default-features = false }
|
Loading…
Reference in a new issue