From 99bbddedb1e70fc885e05cb398d8bfb438b039ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 21 Feb 2017 13:15:07 +0100
Subject: [PATCH] Fix building without S3 support

http://hydra.nixos.org/build/49031196/nixlog/2/raw
---
 src/libstore/download.cc         | 2 +-
 src/libstore/legacy-ssh-store.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libstore/download.cc b/src/libstore/download.cc
index d301d4409..0ca41b15b 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 5d9e5aad6..b20ff185f 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