diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/libraries/aws-sdk-cpp/default.nix | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/libraries/aws-sdk-cpp/default.nix')
-rw-r--r-- | pkgs/development/libraries/aws-sdk-cpp/default.nix | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 94827743bf3..2aa5ea015fd 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-tls, 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 @@ -26,19 +26,29 @@ stdenv.mkDerivation rec { buildInputs = [ curl openssl zlib - aws-c-common aws-c-event-stream aws-checksums ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) [ CoreAudio AudioToolbox ]; + # propagation is needed for Security.framework to be available when linking + propagatedBuildInputs = [ + aws-c-cal + aws-c-event-stream + aws-c-io + aws-c-common + aws-checksums + s2n-tls + ]; + cmakeFlags = [ "-DBUILD_DEPS=OFF" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ] ++ 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,19 +63,18 @@ 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 ]; + # Builds in 2+h with 2 cores, and ~10m with a big-parallel builder. + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { description = "A C++ interface for Amazon Web Services"; homepage = "https://github.com/awslabs/aws-sdk-cpp"; |