diff options
| author | Orivej Desh <orivej@gmx.fr> | 2020-12-26 10:49:43 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2021-01-06 06:05:51 +0000 |
| commit | ff3f5bb60c7f27c45832ae73eeacce931f77b625 (patch) | |
| tree | 52968901dfc0e2ad8ebdc20d71beddd4c3b60465 /pkgs/development/libraries/aws-sdk-cpp | |
| parent | 41fee267fd3fd095243c9d65a588a062e479bc99 (diff) | |
| download | nixpkgs-ff3f5bb60c7f27c45832ae73eeacce931f77b625.tar nixpkgs-ff3f5bb60c7f27c45832ae73eeacce931f77b625.tar.gz nixpkgs-ff3f5bb60c7f27c45832ae73eeacce931f77b625.tar.bz2 nixpkgs-ff3f5bb60c7f27c45832ae73eeacce931f77b625.tar.lz nixpkgs-ff3f5bb60c7f27c45832ae73eeacce931f77b625.tar.xz nixpkgs-ff3f5bb60c7f27c45832ae73eeacce931f77b625.tar.zst nixpkgs-ff3f5bb60c7f27c45832ae73eeacce931f77b625.zip | |
aws-sdk-cpp: 1.7.90 -> 1.8.113
Diffstat (limited to 'pkgs/development/libraries/aws-sdk-cpp')
| -rw-r--r-- | pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/aws-sdk-cpp/default.nix | 16 |
2 files changed, 6 insertions, 20 deletions
diff --git a/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch b/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch index 6e4cad9e73c..b2f12e77025 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch +++ b/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch @@ -1,15 +1,5 @@ -diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake -index e87252123e..5457bd5910 100644 --- a/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) message(FATAL_ERROR "AWS SDK for C++ is missing, please install it first") endif() diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 94827743bf3..fc3f7896dbe 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib, fetchpatch -, aws-c-common, aws-c-event-stream, aws-checksums +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n, zlib +, aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums , CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.7.90"; + version = "1.8.113"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0zpqi612qmm0n53crxiisv0vdif43ymg13kafy6vv43j2wmh66ga"; + sha256 = "0y784cjrxgrin3ck5f2lk0riyy9kv928kcb9y0gzka65imgma48c"; }; # FIXME: might be nice to put different APIs in different outputs @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake curl ]; buildInputs = [ - curl openssl zlib - aws-c-common aws-c-event-stream aws-checksums + curl openssl s2n zlib + aws-c-cal aws-c-common aws-c-event-stream aws-c-io aws-checksums ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) @@ -59,10 +59,6 @@ stdenv.mkDerivation rec { __darwinAllowLocalNetworking = true; patches = [ - (fetchpatch { - url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch"; - sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr"; - }) ./cmake-dirs.patch ]; |