diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-08-06T15·20+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-08-06T15·20+0200 |
| commit | 7de3e00ad905bba85abadd86b83973fdba8d0dfd (patch) | |
| tree | 2dd48677ef2c7df0e057a0749fa6bed258b6d64a /release-common.nix | |
| parent | d3761f5f8bce1e4c8dcfdff3fa77c173157c0346 (diff) | |
Fix setting Content-Encoding in S3 uploads
Fixes https://github.com/NixOS/nix/issues/2333 and https://github.com/NixOS/nixpkgs/issues/44337.
Diffstat (limited to 'release-common.nix')
| -rw-r--r-- | release-common.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/release-common.nix b/release-common.nix index f98e86a1b444..e23967bdbfdc 100644 --- a/release-common.nix +++ b/release-common.nix @@ -60,10 +60,15 @@ rec { ++ lib.optionals stdenv.isLinux [libseccomp utillinuxMinimal] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) - (aws-sdk-cpp.override { + ((aws-sdk-cpp.override { apis = ["s3" "transfer"]; customMemoryManagement = false; - }); + }).overrideDerivation (args: { + patches = args.patches or [] ++ [ (fetchpatch { + url = https://github.com/edolstra/aws-sdk-cpp/commit/3e07e1f1aae41b4c8b340735ff9e8c735f0c063f.patch; + sha256 = "1pij0v449p166f9l29x7ppzk8j7g9k9mp15ilh5qxp29c7fnvxy2"; + }) ]; + })); perlDeps = [ perl |