From fe912e67e38a1ad1b8a9f33a41db4f1d6d775280 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 7 Jan 2022 07:03:43 -0500 Subject: [PATCH 1/2] aws-sdk-cpp: update GitHub repo owner --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 25570b7d03a0..bca567d4eff1 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { version = "1.9.121"; src = fetchFromGitHub { - owner = "awslabs"; + owner = "aws"; repo = "aws-sdk-cpp"; rev = version; sha256 = "sha256-VQpWauk0tdJ1QU0HmtdTwQdKbiAuTTXXsUo2cqpqmdU="; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C++ interface for Amazon Web Services"; - homepage = "https://github.com/awslabs/aws-sdk-cpp"; + homepage = "https://github.com/aws/aws-sdk-cpp"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ eelco orivej ]; From c7548ff9a94a1c3e7a3b15381fd0236de773fb98 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 7 Jan 2022 07:04:56 -0500 Subject: [PATCH 2/2] aws-sdk-cpp: fix cmake config --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index bca567d4eff1..c2ad242b47aa 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n-tls, zlib +{ lib, stdenv, fetchFromGitHub, fetchpatch, 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 @@ -82,6 +82,12 @@ stdenv.mkDerivation rec { patches = [ ./cmake-dirs.patch + + # fix cmake config + (fetchpatch { + url = "https://github.com/aws/aws-sdk-cpp/commit/b102aaf5693c4165c84b616ab9ffb9edfb705239.diff"; + sha256 = "sha256-38QBo3MEFpyHPb8jZEURRPkoeu4DqWhVeErJayiHKF0="; + }) ]; # Builds in 2+h with 2 cores, and ~10m with a big-parallel builder.