diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-08-11 16:22:42 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-08-11 16:22:42 +0200 |
| commit | 4e7e464ae8e897d487fc412b50560f9f5f744353 (patch) | |
| tree | 606f3898906c89a001671f51e6c0315d73e79277 /pkgs/development/libraries/libdeltachat/no-static-lib.patch | |
| parent | 610ef47b2030813fcc9017eeda5bfd7621851bc3 (diff) | |
| parent | 59287a7ba19cafec0301f77acf16ee28b4f5fd84 (diff) | |
| download | nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.tar nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.tar.gz nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.tar.bz2 nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.tar.lz nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.tar.xz nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.tar.zst nixlib-4e7e464ae8e897d487fc412b50560f9f5f744353.zip | |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/tools/system/sg3_utils/default.nix
Diffstat (limited to 'pkgs/development/libraries/libdeltachat/no-static-lib.patch')
| -rw-r--r-- | pkgs/development/libraries/libdeltachat/no-static-lib.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libdeltachat/no-static-lib.patch b/pkgs/development/libraries/libdeltachat/no-static-lib.patch new file mode 100644 index 000000000000..95238cf88524 --- /dev/null +++ b/pkgs/development/libraries/libdeltachat/no-static-lib.patch @@ -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 } |