nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 15:32:43 +01:00
Code Activity

Fix hang in build-remote

Browse source
This commit is contained in:
Eelco Dolstra 2018-02-12 22:48:55 +01:00
parent 4f09ce7940
commit 9bcb4d2dd9
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libstore/local-store.cc
View file

@ -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});