about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-02-21T12·15+0100
committerEelco Dolstra <edolstra@gmail.com>2017-02-21T12·15+0100
commit99bbddedb1e70fc885e05cb398d8bfb438b039ed (patch)
treee15f582d4c522dd99dc837198da9d4efc7b7edf9
parent79f4583f8a3facdd6422ab8c8530a4f5295e1045 (diff)
Fix building without S3 support
http://hydra.nixos.org/build/49031196/nixlog/2/raw
-rw-r--r--src/libstore/download.cc2
-rw-r--r--src/libstore/legacy-ssh-store.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/download.cc b/src/libstore/download.cc
index d301d4409b03..0ca41b15bf7d 100644
--- a/src/libstore/download.cc
+++ b/src/libstore/download.cc
@@ -489,7 +489,7 @@ struct CurlDownloader : public Downloader
         /* Ugly hack to support s3:// URIs. */
         if (hasPrefix(request.uri, "s3://")) {
             // FIXME: do this on a worker thread
-            sync2async<DownloadResult>(success, failure, [&]() {
+            sync2async<DownloadResult>(success, failure, [&]() -> DownloadResult {
 #ifdef ENABLE_S3
                 S3Helper s3Helper;
                 auto slash = request.uri.find('/', 5);
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index 5d9e5aad6e0a..b20ff185f9ba 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -225,7 +225,7 @@ struct LegacySSHStore : public Store
     void collectGarbage(const GCOptions & options, GCResults & results) override
     { unsupported(); }
 
-    ref<FSAccessor> getFSAccessor()
+    ref<FSAccessor> getFSAccessor() override
     { unsupported(); }
 
     void addSignatures(const Path & storePath, const StringSet & sigs) override