From ea749b3ad132512b7e961f761da9c3e0d558e81c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gregor.kleen@ifi.lmu.de>
Date: Fri, 17 Sep 2021 10:35:34 +0200
Subject: [PATCH] chore(gitlab-ci): ...

---
 .gitlab-ci/fix-aws-scheme.patch | 13 +++++++++++++
 .gitlab-ci/patched-nix.nix      |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 .gitlab-ci/fix-aws-scheme.patch

diff --git a/.gitlab-ci/fix-aws-scheme.patch b/.gitlab-ci/fix-aws-scheme.patch
new file mode 100644
index 000000000..ac9416262
--- /dev/null
+++ b/.gitlab-ci/fix-aws-scheme.patch
@@ -0,0 +1,13 @@
+diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
+index 6bfbee044..51d86c4e6 100644
+--- a/src/libstore/s3-binary-cache-store.cc
++++ b/src/libstore/s3-binary-cache-store.cc
+@@ -209,7 +209,7 @@ struct S3BinaryCacheStoreImpl : virtual S3BinaryCacheStoreConfig, public virtual
+     S3Helper s3Helper;
+ 
+     S3BinaryCacheStoreImpl(
+-        const std::string & scheme,
++        const std::string & uriScheme,
+         const std::string & bucketName,
+         const Params & params)
+         : StoreConfig(params)
diff --git a/.gitlab-ci/patched-nix.nix b/.gitlab-ci/patched-nix.nix
index 7b5f707af..84f2d601e 100644
--- a/.gitlab-ci/patched-nix.nix
+++ b/.gitlab-ci/patched-nix.nix
@@ -1,4 +1,4 @@
 { pkgs ? import <nixpkgs> {} }:
 pkgs.nixUnstable.overrideAttrs (oldAttrs: {
-  patches = oldAttrs.patches or [] ++ [ ./debug-aws.patch ];
+  patches = oldAttrs.patches or [] ++ [ ./fix-aws-scheme.patch ];
 })