summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-04-23 10:10:02 +0200
committerVladimír Čunát <v@cunat.cz>2022-04-23 10:10:02 +0200
commitbc41b01dd7a9fdffd32d9b03806798797532a5fe (patch)
treec1bc8c769a3128fe6fd4f510f950806a4474878d
parentd40bc361cc862bd7c53130085f4fa0a6498a7953 (diff)
parentf542643ed32d915a4322b31e1d2c33b9207f0a8a (diff)
downloadnixpkgs-bc41b01dd7a9fdffd32d9b03806798797532a5fe.tar
nixpkgs-bc41b01dd7a9fdffd32d9b03806798797532a5fe.tar.gz
nixpkgs-bc41b01dd7a9fdffd32d9b03806798797532a5fe.tar.bz2
nixpkgs-bc41b01dd7a9fdffd32d9b03806798797532a5fe.tar.lz
nixpkgs-bc41b01dd7a9fdffd32d9b03806798797532a5fe.tar.xz
nixpkgs-bc41b01dd7a9fdffd32d9b03806798797532a5fe.tar.zst
nixpkgs-bc41b01dd7a9fdffd32d9b03806798797532a5fe.zip
Merge #169909: aws-sdk-cpp: revert to older version on i686-linux
-rw-r--r--pkgs/development/libraries/aws-sdk-cpp/default.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 3cd846c87a1..8bf009ddacb 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , curl
 , openssl
@@ -30,13 +31,15 @@ in
 
 stdenv.mkDerivation rec {
   pname = "aws-sdk-cpp";
-  version = "1.9.238";
+  version = if stdenv.system == "i686-linux" then "1.9.150"
+    else "1.9.238";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "sha256-pEmsTfZXsvJMV79dGkjDNbUVajwyoYgzE5DCsC53pGY=";
+    sha256 = if version == "1.9.150" then "fgLdXWQKHaCwulrw9KV3vpQ71DjnQAL4heIRW7Rk7UY="
+      else "sha256-pEmsTfZXsvJMV79dGkjDNbUVajwyoYgzE5DCsC53pGY=";
   };
 
   postPatch = ''
@@ -109,7 +112,12 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./cmake-dirs.patch
-  ];
+  ]
+    ++ lib.optional (lib.versionOlder version "1.9.163")
+      (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.
   requiredSystemFeatures = [ "big-parallel" ];