mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'darwin-s3-binary-cache-store' of https://github.com/shlevy/nix

Browse source
This commit is contained in:
Eelco Dolstra 2017-03-20 17:46:35 +01:00
commit 20df50d8e1
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 89 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/derivations.cc
View file

@ -152,7 +152,7 @@ static StringSet parseStrings(std::istream & str, bool arePaths)
static Derivation parseDerivation(const string & s)
{
Derivation drv;
std::istringstream str(s);
istringstream_nocopy str(s);
expect(str, "Derive([");
/* Parse the list of outputs. */

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

@ -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