From d4e7c195fabf0f24c2ffbd4ca8f189489bbbf44d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Aug 2014 17:44:59 +0200
Subject: [PATCH] Make hook shutdown more reliable

---
 nix/libstore/build.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index 05024f5194..b848b8ca33 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -629,7 +629,6 @@ HookInstance::HookInstance()
     });
 
     pid.setSeparatePG(true);
-    pid.setKillSignal(SIGTERM);
     fromHook.writeSide.close();
     toHook.readSide.close();
 }
@@ -638,6 +637,7 @@ HookInstance::HookInstance()
 HookInstance::~HookInstance()
 {
     try {
+        toHook.writeSide.close();
         pid.kill(true);
     } catch (...) {
         ignoreException();