dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

aws-sdk-cpp: revert to older version on i686-linux

Browse Source 
After update in PR #169281 (commit f394cc6c5) it won't build:
https://hydra.nixos.org/build/174323623

It's still unreliable, as even the i686 builds that succeeded on Hydra
won't build for me locally, shooting over the 32-bit memory limit.
But I trust this will unblock the nixos-unstable channel on Hydra.
This commit is contained in:
Vladimír Čunát 2022-04-23 09:39:01 +02:00
parent 487624c151
commit f542643ed3
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/aws-sdk-cpp/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, curl , curl
, openssl , openssl
@ -30,13 +31,15 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "aws-sdk-cpp"; pname = "aws-sdk-cpp";
version = "1.9.238"; version = if stdenv.system == "i686-linux" then "1.9.150"
else "1.9.238";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aws"; owner = "aws";
repo = "aws-sdk-cpp"; repo = "aws-sdk-cpp";
rev = version; rev = version;
sha256 = "sha256-pEmsTfZXsvJMV79dGkjDNbUVajwyoYgzE5DCsC53pGY="; sha256 = if version == "1.9.150" then "fgLdXWQKHaCwulrw9KV3vpQ71DjnQAL4heIRW7Rk7UY="
else "sha256-pEmsTfZXsvJMV79dGkjDNbUVajwyoYgzE5DCsC53pGY=";
}; };
postPatch = '' postPatch = ''
@ -109,7 +112,12 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./cmake-dirs.patch ./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. # Builds in 2+h with 2 cores, and ~10m with a big-parallel builder.
requiredSystemFeatures = [ "big-parallel" ]; requiredSystemFeatures = [ "big-parallel" ];