diff options
Diffstat (limited to 'pkgs/development/libraries/libdeltachat/no-static-lib.patch')
-rw-r--r-- | pkgs/development/libraries/libdeltachat/no-static-lib.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libdeltachat/no-static-lib.patch b/pkgs/development/libraries/libdeltachat/no-static-lib.patch index 14ea1106138f9..9dc4ffd0ec074 100644 --- a/pkgs/development/libraries/libdeltachat/no-static-lib.patch +++ b/pkgs/development/libraries/libdeltachat/no-static-lib.patch @@ -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" |