about summary refs log tree commit diff
path: root/src/libstore/download.cc
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2017-03-12T14·01-0400
committerShea Levy <shea@shealevy.com>2017-03-12T14·01-0400
commit96443e94a1932cff13f23d202839c53483b9290e (patch)
treefa341dec7b83b689377893e772cd62bd120775ec /src/libstore/download.cc
parentae568847f5ee2dfd4226f30fa64fdc122623229b (diff)
parent5789eaa3f45cadec719b4f642de2169b8b0a56c4 (diff)
Merge branch 'configurable-aws-region'
Diffstat (limited to 'src/libstore/download.cc')
-rw-r--r--src/libstore/download.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstore/download.cc b/src/libstore/download.cc
index ebea3800ac34..6567a4dc4754 100644
--- a/src/libstore/download.cc
+++ b/src/libstore/download.cc
@@ -5,6 +5,9 @@
 #include "store-api.hh"
 #include "archive.hh"
 #include "s3.hh"
+#ifdef ENABLE_S3
+#include <aws/core/client/ClientConfiguration.h>
+#endif
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -495,7 +498,7 @@ struct CurlDownloader : public Downloader
             // FIXME: do this on a worker thread
             sync2async<DownloadResult>(success, failure, [&]() -> DownloadResult {
 #ifdef ENABLE_S3
-                S3Helper s3Helper;
+                S3Helper s3Helper(Aws::Region::US_EAST_1); // FIXME: make configurable
                 auto slash = request.uri.find('/', 5);
                 if (slash == std::string::npos)
                     throw nix::Error("bad S3 URI ‘%s’", request.uri);