diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch | |
parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch b/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch new file mode 100644 index 000000000000..e21b4e9a7a71 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch @@ -0,0 +1,27 @@ +--- source/CMakeLists.txt ++++ source/CMakeLists.txt +@@ -56,11 +56,6 @@ target_include_directories(${IPFS_API_LIBNAME} + ) + + # Fetch "JSON for Modern C++" +-include(FetchContent) +-message(STATUS "Fetching nlohmann/JSON") +-# Retrieve Nlohmann JSON +-FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.10.5/json.tar.xz) +-FetchContent_MakeAvailable(json) + + # libcurl requires additional libs only for static Windows builds + if(WIN32) +@@ -71,12 +66,11 @@ set_target_properties(${IPFS_API_LIBNAME} PROPERTIES + SOVERSION ${PROJECT_VERSION_MAJOR} + VERSION ${PROJECT_VERSION} + ) +-target_link_libraries(${IPFS_API_LIBNAME} ${CURL_LIBRARIES} ${WINDOWS_CURL_LIBS} nlohmann_json::nlohmann_json) ++target_link_libraries(${IPFS_API_LIBNAME} ${CURL_LIBRARIES} ${WINDOWS_CURL_LIBS}) + if(NOT DISABLE_INSTALL) + install(TARGETS ${IPFS_API_LIBNAME} DESTINATION lib) + install(FILES include/ipfs/client.h DESTINATION include/ipfs) + install(FILES include/ipfs/http/transport.h DESTINATION include/ipfs/http) +- install(FILES ${json_SOURCE_DIR}/include/nlohmann/json.hpp DESTINATION include/nlohmann) + endif() + # Tests, use "CTEST_OUTPUT_ON_FAILURE=1 make test" to see output from failed tests |