about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-02-12T21·48+0100
committerEelco Dolstra <edolstra@gmail.com>2018-02-12T21·48+0100
commit9bcb4d2dd99ba7509c27479eecf1e7ac88244fa8 (patch)
tree3d1e059d675b689271806086fee86501f9872d0b
parent4f09ce7940689887a18d4aa44367d2e6abeaa3cf (diff)
Fix hang in build-remote
-rw-r--r--src/build-remote/build-remote.cc2
-rw-r--r--src/libstore/local-store.cc1
-rw-r--r--src/libstore/local-store.hh3
3 files changed, 4 insertions, 2 deletions
diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc
index df579729af29..c6e75e8cc704 100644
--- a/src/build-remote/build-remote.cc
+++ b/src/build-remote/build-remote.cc
@@ -241,7 +241,7 @@ connected:
 
         if (!missing.empty()) {
             Activity act(*logger, lvlTalkative, actUnknown, fmt("copying outputs from '%s'", storeUri));
-            setenv("NIX_HELD_LOCKS", concatStringsSep(" ", missing).c_str(), 1); /* FIXME: ugly */
+            store->locksHeld.insert(missing.begin(), missing.end()); /* FIXME: ugly */
             copyPaths(ref<Store>(sshStore), store, missing, NoRepair, NoCheckSigs, substitute);
         }
 
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 8a79fc7235fa..4afe51ea91ec 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -992,7 +992,6 @@ void LocalStore::addToStore(const ValidPathInfo & info, const ref<std::string> &
         /* Lock the output path.  But don't lock if we're being called
            from a build hook (whose parent process already acquired a
            lock on this path). */
-        static auto locksHeld = tokenizeString<PathSet>(getEnv("NIX_HELD_LOCKS"));
         if (!locksHeld.count(info.path))
             outputLock.lockPaths({realPath});
 
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index 30bef3a799d4..bbd50e1c1451 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -104,6 +104,9 @@ private:
 
 public:
 
+    // Hack for build-remote.cc.
+    PathSet locksHeld = tokenizeString<PathSet>(getEnv("NIX_HELD_LOCKS"));
+
     /* Initialise the local store, upgrading the schema if
        necessary. */
     LocalStore(const Params & params);