cpp-ipfs-api: 2017-01-04 -> 2022-01-30, unbreak build, rename to cpp-ipfs-client-api (#173197)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
parent
d7a9accd46
commit
2dcb64eefa
|
@ -1,28 +0,0 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
pname = "cpp-ipfs-api";
|
|
||||||
version = "2017-01-04";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "vasild";
|
|
||||||
repo = "cpp-ipfs-api";
|
|
||||||
rev = "96a890f4518665a56581a2a52311eaa65928eac8";
|
|
||||||
sha256 = "1z6gbd7npg4pd9wmdyzcp9h12sg84d7a43c69pp4lzqkyqg8pz1g";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
|
||||||
buildInputs = [ curl ];
|
|
||||||
propagatedBuildInputs = [ nlohmann_json ];
|
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = [
|
|
||||||
"-Wno-error=range-loop-construct"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "IPFS C++ API client library";
|
|
||||||
homepage = "https://github.com/vasild/cpp-ipfs-api";
|
|
||||||
license = licenses.mit;
|
|
||||||
platforms = platforms.all;
|
|
||||||
};
|
|
||||||
}
|
|
35
pkgs/development/libraries/cpp-ipfs-http-client/default.nix
Normal file
35
pkgs/development/libraries/cpp-ipfs-http-client/default.nix
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
{ lib, stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
pname = "cpp-ipfs-http-client";
|
||||||
|
version = "unstable-2022-01-30";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "vasild";
|
||||||
|
repo = "cpp-ipfs-http-client";
|
||||||
|
rev = "3cdfa7fc6326e49fc81b3c7ca43ce83bdccef6d9";
|
||||||
|
sha256 = "sha256-/oyafnk4SbrvoCh90wkZXNBjknMKA6EEUoEGo/amLUo=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [ ./unvendor-nlohmann-json.patch ];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace '# Fetch "JSON for Modern C++"' "include_directories(${nlohmann_json}/include)"
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake ];
|
||||||
|
buildInputs = [ curl ];
|
||||||
|
propagatedBuildInputs = [ nlohmann_json ];
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = [
|
||||||
|
"-Wno-error=range-loop-construct"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "IPFS C++ API client library";
|
||||||
|
homepage = "https://github.com/vasild/cpp-ipfs-http-client";
|
||||||
|
license = licenses.mit;
|
||||||
|
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -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
|
|
@ -170,6 +170,7 @@ mapAliases ({
|
||||||
cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22
|
cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22
|
||||||
cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11
|
cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11
|
||||||
ckb = throw "'ckb' has been renamed to/replaced by 'ckb-next'"; # Converted to throw 2022-02-22
|
ckb = throw "'ckb' has been renamed to/replaced by 'ckb-next'"; # Converted to throw 2022-02-22
|
||||||
|
cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
|
||||||
creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01
|
creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01
|
||||||
|
|
||||||
# these are for convenience, not for backward compat and shouldn't expire
|
# these are for convenience, not for backward compat and shouldn't expire
|
||||||
|
|
|
@ -16887,7 +16887,7 @@ with pkgs;
|
||||||
|
|
||||||
cpp-hocon = callPackage ../development/libraries/cpp-hocon { };
|
cpp-hocon = callPackage ../development/libraries/cpp-hocon { };
|
||||||
|
|
||||||
cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { };
|
cpp-ipfs-http-client = callPackage ../development/libraries/cpp-ipfs-http-client { };
|
||||||
|
|
||||||
cpp-netlib = callPackage ../development/libraries/cpp-netlib {
|
cpp-netlib = callPackage ../development/libraries/cpp-netlib {
|
||||||
boost = boost169; # fatal error: 'boost/asio/stream_socket_service.hpp' file not found
|
boost = boost169; # fatal error: 'boost/asio/stream_socket_service.hpp' file not found
|
||||||
|
|
Loading…
Reference in a new issue