mirror of
https://github.com/NixOS/nix
synced 2025-06-25 23:11:16 +02:00
Merge branch 'darwin-s3-binary-cache-store' of https://github.com/shlevy/nix
This commit is contained in:
commit
20df50d8e1
4 changed files with 89 additions and 15 deletions
|
@ -122,17 +122,6 @@ S3Helper::DownloadResult S3Helper::getObject(
|
|||
return res;
|
||||
}
|
||||
|
||||
#if __linux__
|
||||
|
||||
struct istringstream_nocopy : public std::stringstream
|
||||
{
|
||||
istringstream_nocopy(const std::string & s)
|
||||
{
|
||||
rdbuf()->pubsetbuf(
|
||||
(char *) s.data(), s.size());
|
||||
}
|
||||
};
|
||||
|
||||
struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
|
||||
{
|
||||
std::string bucketName;
|
||||
|
@ -344,8 +333,6 @@ static RegisterStoreImplementation regStore([](
|
|||
return store;
|
||||
});
|
||||
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue