lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Fix building without S3 support

Browse source 
http://hydra.nixos.org/build/49031196/nixlog/2/raw
This commit is contained in:
Eelco Dolstra 2017-02-21 13:15:07 +01:00
parent 79f4583f8a
commit 99bbddedb1
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/download.cc
View file

@ -489,7 +489,7 @@ struct CurlDownloader : public Downloader
/* Ugly hack to support s3:// URIs. */ /* Ugly hack to support s3:// URIs. */
if (hasPrefix(request.uri, "s3://")) { if (hasPrefix(request.uri, "s3://")) {
// FIXME: do this on a worker thread // FIXME: do this on a worker thread
sync2async<DownloadResult>(success, failure, [&]() { sync2async<DownloadResult>(success, failure, [&]() -> DownloadResult {
#ifdef ENABLE_S3 #ifdef ENABLE_S3
S3Helper s3Helper; S3Helper s3Helper;
auto slash = request.uri.find('/', 5); auto slash = request.uri.find('/', 5);

2
src/libstore/legacy-ssh-store.cc
View file

@ -225,7 +225,7 @@ struct LegacySSHStore : public Store
void collectGarbage(const GCOptions & options, GCResults & results) override void collectGarbage(const GCOptions & options, GCResults & results) override
{ unsupported(); } { unsupported(); }
ref<FSAccessor> getFSAccessor() ref<FSAccessor> getFSAccessor() override
{ unsupported(); } { unsupported(); }
void addSignatures(const Path & storePath, const StringSet & sigs) override void addSignatures(const Path & storePath, const StringSet & sigs) override