lol

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

+11 -3
+11 -3
pkgs/development/libraries/aws-sdk-cpp/default.nix
··· 1 { lib 2 , stdenv 3 , fetchFromGitHub 4 , cmake 5 , curl 6 , openssl ··· 30 31 stdenv.mkDerivation rec { 32 pname = "aws-sdk-cpp"; 33 - version = "1.9.238"; 34 35 src = fetchFromGitHub { 36 owner = "aws"; 37 repo = "aws-sdk-cpp"; 38 rev = version; 39 - sha256 = "sha256-pEmsTfZXsvJMV79dGkjDNbUVajwyoYgzE5DCsC53pGY="; 40 }; 41 42 postPatch = '' ··· 109 110 patches = [ 111 ./cmake-dirs.patch 112 - ]; 113 114 # Builds in 2+h with 2 cores, and ~10m with a big-parallel builder. 115 requiredSystemFeatures = [ "big-parallel" ];
··· 1 { lib 2 , stdenv 3 , fetchFromGitHub 4 + , fetchpatch 5 , cmake 6 , curl 7 , openssl ··· 31 32 stdenv.mkDerivation rec { 33 pname = "aws-sdk-cpp"; 34 + version = if stdenv.system == "i686-linux" then "1.9.150" 35 + else "1.9.238"; 36 37 src = fetchFromGitHub { 38 owner = "aws"; 39 repo = "aws-sdk-cpp"; 40 rev = version; 41 + sha256 = if version == "1.9.150" then "fgLdXWQKHaCwulrw9KV3vpQ71DjnQAL4heIRW7Rk7UY=" 42 + else "sha256-pEmsTfZXsvJMV79dGkjDNbUVajwyoYgzE5DCsC53pGY="; 43 }; 44 45 postPatch = '' ··· 112 113 patches = [ 114 ./cmake-dirs.patch 115 + ] 116 + ++ lib.optional (lib.versionOlder version "1.9.163") 117 + (fetchpatch { 118 + url = "https://github.com/aws/aws-sdk-cpp/commit/b102aaf5693c4165c84b616ab9ffb9edfb705239.diff"; 119 + sha256 = "sha256-38QBo3MEFpyHPb8jZEURRPkoeu4DqWhVeErJayiHKF0="; 120 + }); 121 122 # Builds in 2+h with 2 cores, and ~10m with a big-parallel builder. 123 requiredSystemFeatures = [ "big-parallel" ];