public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aws-sdk-cpp: 1.7.90 -> 1.8.113

Browse Source
This commit is contained in:
Orivej Desh 2020-12-26 10:49:43 +00:00
parent 41fee267fd
commit ff3f5bb60c
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch
View File

@ -1,15 +1,5 @@
diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake
index e87252123e..5457bd5910 100644
--- a/cmake/AWSSDKConfig.cmake --- a/cmake/AWSSDKConfig.cmake
+++ b/cmake/AWSSDKConfig.cmake +++ b/cmake/AWSSDKConfig.cmake
@@ -82,6 +82,7 @@ if (AWSSDK_ROOT_DIR)
)
else()
find_file(AWSSDK_CORE_HEADER_FILE Aws.h
+ "/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
"/usr/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
"/usr/local/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
"C:/Progra~1/AWSSDK/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
@@ -97,14 +98,18 @@ if (NOT AWSSDK_CORE_HEADER_FILE) @@ -97,14 +98,18 @@ if (NOT AWSSDK_CORE_HEADER_FILE)
message(FATAL_ERROR "AWS SDK for C++ is missing, please install it first") message(FATAL_ERROR "AWS SDK for C++ is missing, please install it first")
endif() endif()

16
pkgs/development/libraries/aws-sdk-cpp/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib, fetchpatch { lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n, zlib
, aws-c-common, aws-c-event-stream, aws-checksums , aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums
, CoreAudio, AudioToolbox , CoreAudio, AudioToolbox
, # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. , # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
apis ? ["*"] apis ? ["*"]
@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "aws-sdk-cpp"; pname = "aws-sdk-cpp";
version = "1.7.90"; version = "1.8.113";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "awslabs"; owner = "awslabs";
repo = "aws-sdk-cpp"; repo = "aws-sdk-cpp";
rev = version; rev = version;
sha256 = "0zpqi612qmm0n53crxiisv0vdif43ymg13kafy6vv43j2wmh66ga"; sha256 = "0y784cjrxgrin3ck5f2lk0riyy9kv928kcb9y0gzka65imgma48c";
}; };
# FIXME: might be nice to put different APIs in different outputs # FIXME: might be nice to put different APIs in different outputs
@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake curl ]; nativeBuildInputs = [ cmake curl ];
buildInputs = [ buildInputs = [
curl openssl zlib curl openssl s2n zlib
aws-c-common aws-c-event-stream aws-checksums aws-c-cal aws-c-common aws-c-event-stream aws-c-io aws-checksums
] ++ lib.optionals (stdenv.isDarwin && ] ++ lib.optionals (stdenv.isDarwin &&
((builtins.elem "text-to-speech" apis) || ((builtins.elem "text-to-speech" apis) ||
(builtins.elem "*" apis))) (builtins.elem "*" apis)))
@ -59,10 +59,6 @@ stdenv.mkDerivation rec {
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
patches = [ patches = [
(fetchpatch {
url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch";
sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr";
})
./cmake-dirs.patch ./cmake-dirs.patch
]; ];