kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Hopefully fix build on older GCC

Browse source 
http://hydra.nixos.org/build/46805140
This commit is contained in:
Eelco Dolstra 2017-01-24 15:28:50 +01:00
parent 19ce732a13
commit 4b6d3c5a28
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/build-remote/build-remote.cc
View file

@ -68,7 +68,8 @@ public:
enabled{true} {}; enabled{true} {};
};; };;
static std::vector<machine> read_conf() { static std::vector<machine> read_conf()
{
auto conf = getEnv("NIX_REMOTE_SYSTEMS", SYSCONFDIR "/nix/machines"); auto conf = getEnv("NIX_REMOTE_SYSTEMS", SYSCONFDIR "/nix/machines");
auto machines = std::vector<machine>{}; auto machines = std::vector<machine>{};
@ -108,8 +109,9 @@ static std::vector<machine> read_conf() {
static string currentLoad; static string currentLoad;
static int openSlotLock(const machine & m, unsigned long long slot) { static int openSlotLock(const machine & m, unsigned long long slot)
auto fn_stream = std::stringstream(currentLoad, std::ios_base::ate | std::ios_base::out); {
std::ostringstream fn_stream(currentLoad, std::ios_base::ate | std::ios_base::out);
fn_stream << "/"; fn_stream << "/";
for (auto t : m.systemTypes) { for (auto t : m.systemTypes) {
fn_stream << t << "-"; fn_stream << t << "-";