Restore default signal handling in child processes

In particular, this fixes Ctrl-C in nix-shell sessions.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 7fb5271f4a..40927c0632 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -400,6 +400,8 @@ void Goal::trace(const format & f)
 /* Common initialisation performed in child processes. */
 static void commonChildInit(Pipe & logPipe)
 {
+    restoreSignals();
+
     /* Put the child in a separate session (and thus a separate
        process group) so that it has no controlling terminal (meaning
        that e.g. ssh cannot open /dev/tty) and it doesn't receive
@@ -2662,8 +2664,6 @@ void DerivationGoal::runChild()
         for (auto & i : drv->args)
             args.push_back(rewriteStrings(i, inputRewrites));
 
-        restoreSIGPIPE();
-
         /* Indicate that we managed to set up the build environment. */
         writeFull(STDERR_FILENO, string("\1\n"));