diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-08 12:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-08 12:01:36 +0000 |
| commit | cf7efe11923f713a45dec1436101da71355e89e5 (patch) | |
| tree | 17be4dfc01e8efdaa838a83b2d86c37ed73b5395 /pkgs/development/libraries/aws-sdk-cpp | |
| parent | 09634364bcf26cd57cd1b1e2b623ca27230a1030 (diff) | |
| parent | c1fac0a1c0361f697a345f8a408717becd6ad193 (diff) | |
| download | nixpkgs-cf7efe11923f713a45dec1436101da71355e89e5.tar nixpkgs-cf7efe11923f713a45dec1436101da71355e89e5.tar.gz nixpkgs-cf7efe11923f713a45dec1436101da71355e89e5.tar.bz2 nixpkgs-cf7efe11923f713a45dec1436101da71355e89e5.tar.lz nixpkgs-cf7efe11923f713a45dec1436101da71355e89e5.tar.xz nixpkgs-cf7efe11923f713a45dec1436101da71355e89e5.tar.zst nixpkgs-cf7efe11923f713a45dec1436101da71355e89e5.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/aws-sdk-cpp')
| -rw-r--r-- | pkgs/development/libraries/aws-sdk-cpp/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index a8759833afb..769cc2d3bd2 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 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { version = "1.9.150"; src = fetchFromGitHub { - owner = "awslabs"; + owner = "aws"; repo = "aws-sdk-cpp"; rev = version; sha256 = "sha256-fgLdXWQKHaCwulrw9KV3vpQ71DjnQAL4heIRW7Rk7UY="; @@ -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. @@ -89,7 +95,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 ]; |