diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/libraries/aws-sdk-cpp | |
parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/aws-sdk-cpp')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch | 10 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix | 21 |
2 files changed, 9 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch index 6e4cad9e73cf..b2f12e77025c 100644 --- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index 94827743bf3d..7b10fc463dd1 100644 --- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/nixpkgs/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.121"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0zpqi612qmm0n53crxiisv0vdif43ymg13kafy6vv43j2wmh66ga"; + sha256 = "sha256-uita3HPcerxH/bnSIL3ZNUp68QXtKJLYi0pcnV7OBkQ="; }; # 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))) @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-DENABLE_TESTING=OFF" - "-DCURL_HAS_H2=0" + "-DCURL_HAS_H2=1" + "-DCURL_HAS_TLS_PROXY=1" ] ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; @@ -53,16 +54,12 @@ stdenv.mkDerivation rec { postFixupHooks = [ # This bodge is necessary so that the file that the generated -config.cmake file # points to an existing directory. - ''mkdir -p $out/include'' + "mkdir -p $out/include" ]; __darwinAllowLocalNetworking = true; patches = [ - (fetchpatch { - url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch"; - sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr"; - }) ./cmake-dirs.patch ]; |