wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-30 11:43:15 +02:00
Code Activity

Make the aws-cpp-sdk dependency optional

Browse source
This commit is contained in:
Eelco Dolstra 2016-05-04 17:16:48 +02:00
parent 16d9c872e4
commit 75d2492f20
6 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/local.mk
View file

@ -8,7 +8,11 @@ libstore_SOURCES := $(wildcard $(d)/*.cc)
libstore_LIBS = libutil libformat
libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS) $(SODIUM_LIBS) -laws-cpp-sdk-s3 -laws-cpp-sdk-core -pthread
libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread
ifeq ($(ENABLE_S3), 1)
libstore_LDFLAGS += -laws-cpp-sdk-s3 -laws-cpp-sdk-core
endif
ifeq ($(OS), SunOS)
libstore_LDFLAGS += -lsocket

6
src/libstore/s3-binary-cache-store.cc
View file

@ -1,3 +1,7 @@
#include "config.h"
#if ENABLE_S3
#include "s3-binary-cache-store.hh"
#include "nar-info.hh"
#include "nar-info-disk-cache.hh"
@ -251,3 +255,5 @@ static RegisterStoreImplementation regStore([](
});
}
#endif