mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 13:48:21 +03:00
rnp: 0.17.0 -> 0.17.1
This commit is contained in:
parent
84ffa43f4b
commit
d9687d7223
@ -16,20 +16,18 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "rnp";
|
pname = "rnp";
|
||||||
version = "0.17.0";
|
version = "0.17.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rnpgp";
|
owner = "rnpgp";
|
||||||
repo = "rnp";
|
repo = "rnp";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-4fB7Sl9+ATrJTRnhbNG5BoW3XLxR7IP167RK96+gxj0=";
|
hash = "sha256-jUh7BxRnB6KePCk1jIvKzXgxSmWdKlQYmxshZZY4SBQ";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ zlib bzip2 json_c botan2 sexpp ];
|
buildInputs = [ zlib bzip2 json_c botan2 sexpp ];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./unbundle-sexpp.patch
|
|
||||||
./sexp_sexpp_rename.patch
|
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
@ -38,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
"-DBUILD_TESTING=on"
|
"-DBUILD_TESTING=on"
|
||||||
"-DDOWNLOAD_GTEST=off"
|
"-DDOWNLOAD_GTEST=off"
|
||||||
"-DDOWNLOAD_RUBYRNP=off"
|
"-DDOWNLOAD_RUBYRNP=off"
|
||||||
|
"-DSYSTEM_LIBSEXPP=on"
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ asciidoctor cmake gnupg gtest pkg-config python3 ];
|
nativeBuildInputs = [ asciidoctor cmake gnupg gtest pkg-config python3 ];
|
||||||
|
@ -1,50 +0,0 @@
|
|||||||
diff --git i/src/lib/CMakeLists.txt w/src/lib/CMakeLists.txt
|
|
||||||
index 086ac57d..2ce59ca1 100755
|
|
||||||
--- i/src/lib/CMakeLists.txt
|
|
||||||
+++ w/src/lib/CMakeLists.txt
|
|
||||||
@@ -328,7 +328,7 @@ elseif (CRYPTO_BACKEND_OPENSSL)
|
|
||||||
target_link_libraries(librnp-obj PRIVATE OpenSSL::Crypto)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-target_link_libraries(librnp-obj PRIVATE sexp)
|
|
||||||
+target_link_libraries(librnp-obj PRIVATE sexpp)
|
|
||||||
|
|
||||||
set_target_properties(librnp-obj PROPERTIES CXX_VISIBILITY_PRESET hidden)
|
|
||||||
if (TARGET BZip2::BZip2)
|
|
||||||
@@ -384,7 +384,7 @@ foreach (prop LINK_LIBRARIES INTERFACE_LINK_LIBRARIES INCLUDE_DIRECTORIES INTERF
|
|
||||||
get_target_property(val librnp-obj ${prop})
|
|
||||||
if (BUILD_SHARED_LIBS)
|
|
||||||
set_property(TARGET librnp-static PROPERTY ${prop} ${val})
|
|
||||||
- list(REMOVE_ITEM val "$<LINK_ONLY:sexp>")
|
|
||||||
+ list(REMOVE_ITEM val "$<LINK_ONLY:sexpp>")
|
|
||||||
set_property(TARGET librnp PROPERTY ${prop} ${val})
|
|
||||||
else()
|
|
||||||
set_property(TARGET librnp PROPERTY ${prop} ${val})
|
|
||||||
diff --git i/src/librekey/g23_sexp.hpp w/src/librekey/g23_sexp.hpp
|
|
||||||
index b888680f..b062c52f 100644
|
|
||||||
--- i/src/librekey/g23_sexp.hpp
|
|
||||||
+++ w/src/librekey/g23_sexp.hpp
|
|
||||||
@@ -27,8 +27,8 @@
|
|
||||||
#ifndef RNP_G23_SEXP_HPP
|
|
||||||
#define RNP_G23_SEXP_HPP
|
|
||||||
|
|
||||||
-#include "sexp/sexp.h"
|
|
||||||
-#include "sexp/ext-key-format.h"
|
|
||||||
+#include "sexpp/sexp.h"
|
|
||||||
+#include "sexpp/ext-key-format.h"
|
|
||||||
|
|
||||||
#define SXP_MAX_DEPTH 30
|
|
||||||
|
|
||||||
diff --git i/src/tests/CMakeLists.txt w/src/tests/CMakeLists.txt
|
|
||||||
index 7d2a6b0c..88aeaf9f 100644
|
|
||||||
--- i/src/tests/CMakeLists.txt
|
|
||||||
+++ w/src/tests/CMakeLists.txt
|
|
||||||
@@ -176,7 +176,7 @@ target_link_libraries(rnp_tests
|
|
||||||
PRIVATE
|
|
||||||
librnp-static
|
|
||||||
JSON-C::JSON-C
|
|
||||||
- sexp
|
|
||||||
+ sexpp
|
|
||||||
${GTestMain}
|
|
||||||
)
|
|
||||||
if (CRYPTO_BACKEND_LOWERCASE STREQUAL "openssl")
|
|
@ -1,38 +0,0 @@
|
|||||||
diff --git i/CMakeLists.txt w/CMakeLists.txt
|
|
||||||
index bb6d40cb..30171e7c 100644
|
|
||||||
--- i/CMakeLists.txt
|
|
||||||
+++ w/CMakeLists.txt
|
|
||||||
@@ -176,11 +176,6 @@ if (ENABLE_FUZZERS)
|
|
||||||
endif()
|
|
||||||
add_subdirectory(src/common)
|
|
||||||
|
|
||||||
-set(WITH_SEXP_CLI OFF)
|
|
||||||
-set(WITH_SEXP_TESTS OFF)
|
|
||||||
-set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME development)
|
|
||||||
-add_subdirectory(src/libsexp EXCLUDE_FROM_ALL)
|
|
||||||
-
|
|
||||||
add_subdirectory(src/lib)
|
|
||||||
add_subdirectory(src/rnp)
|
|
||||||
add_subdirectory(src/rnpkeys)
|
|
||||||
diff --git i/src/lib/CMakeLists.txt w/src/lib/CMakeLists.txt
|
|
||||||
index 086ac57d..b219ef06 100755
|
|
||||||
--- i/src/lib/CMakeLists.txt
|
|
||||||
+++ w/src/lib/CMakeLists.txt
|
|
||||||
@@ -433,7 +433,7 @@ install(TARGETS librnp
|
|
||||||
COMPONENT development
|
|
||||||
)
|
|
||||||
|
|
||||||
- install(TARGETS librnp-static sexp
|
|
||||||
+ install(TARGETS librnp-static
|
|
||||||
EXPORT rnp-targets
|
|
||||||
ARCHIVE
|
|
||||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
|
||||||
@@ -441,7 +441,7 @@ install(TARGETS librnp
|
|
||||||
)
|
|
||||||
else(BUILD_SHARED_LIBS)
|
|
||||||
# static libraries only
|
|
||||||
-install(TARGETS librnp sexp
|
|
||||||
+install(TARGETS librnp
|
|
||||||
EXPORT rnp-targets
|
|
||||||
ARCHIVE
|
|
||||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
|
Loading…
Reference in New Issue
Block a user