mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 08:53:21 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
--- 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
|