From 26ffd4a93ea504e31997b65421c387ee064d5847 Mon Sep 17 00:00:00 2001 From: regnat Date: Thu, 8 Apr 2021 14:12:26 +0200 Subject: [PATCH] Fix build with latest master --- flake.lock | 6 +++--- src/hydra-queue-runner/build-remote.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 45995506..12abd38b 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1615194819, - "narHash": "sha256-LfPUsgeFRBzRgTp+828E7UhiVItSYH+CK6IJcjmlcZ4=", + "lastModified": 1617795613, + "narHash": "sha256-dDDZcE3feC8we6azs99pWSz/uqYNPG3DJSNnjgJ6JsQ=", "owner": "NixOS", "repo": "nix", - "rev": "1c0e3e453d41b869e4ac7e25dc1c00c349a7c411", + "rev": "906adadacd2d1c98346a2f42c0b42a32d2806d94", "type": "github" }, "original": { diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc index cce46a05..966e27ca 100644 --- a/src/hydra-queue-runner/build-remote.cc +++ b/src/hydra-queue-runner/build-remote.cc @@ -36,7 +36,7 @@ static void openConnection(Machine::ptr machine, Path tmpDir, int stderrFD, Chil child.pid = startProcess([&]() { - restoreSignals(); + restoreProcessContext(); if (dup2(to.readSide.get(), STDIN_FILENO) == -1) throw SysError("cannot dup input pipe to stdin");