From faa7c72e4537df9063b48463b48c98931bad54ba Mon Sep 17 00:00:00 2001 From: Default email Date: Sun, 17 Oct 2021 05:12:59 +0300 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 9aeeb7574fb784eaf6395f4400705b5f619e6cc3 --- .../development/libraries/aws-sdk-cpp/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index d58fabfd5e..69cb1cc22a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n-tls, zlib -, aws-crt-cpp , 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"]. @@ -18,23 +17,15 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.9.121"; + version = "1.8.130"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-VQpWauk0tdJ1QU0HmtdTwQdKbiAuTTXXsUo2cqpqmdU="; + sha256 = "sha256-5T4l0KYB0utFTdEOtYT9trQ/JehQbXxk/IhI6YavErs="; }; - postPatch = '' - # Includes aws-c-auth private headers, so only works with submodule build - rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - # TestRandomURLMultiThreaded fails - rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp - ''; - # FIXME: might be nice to put different APIs in different outputs # (e.g. libaws-cpp-sdk-s3.so in output "s3"). outputs = [ "out" "dev" ]; @@ -42,7 +33,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake curl ]; buildInputs = [ - aws-crt-cpp curl openssl zlib ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) ||