lix-project/hydra
3
0
Fork 6
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #909 from regnat/nix-master

Browse source 
Fix build with latest master
This commit is contained in:
Eelco Dolstra 2021-04-08 17:56:09 +02:00 committed by GitHub
parent 225634349e 26ffd4a93e
commit 2020ea1335
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1615194819, "lastModified": 1617795613,
"narHash": "sha256-LfPUsgeFRBzRgTp+828E7UhiVItSYH+CK6IJcjmlcZ4=", "narHash": "sha256-dDDZcE3feC8we6azs99pWSz/uqYNPG3DJSNnjgJ6JsQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "1c0e3e453d41b869e4ac7e25dc1c00c349a7c411", "rev": "906adadacd2d1c98346a2f42c0b42a32d2806d94",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
src/hydra-queue-runner/build-remote.cc
View file

@ -36,7 +36,7 @@ static void openConnection(Machine::ptr machine, Path tmpDir, int stderrFD, Chil
child.pid = startProcess([&]() { child.pid = startProcess([&]() {
restoreSignals(); restoreProcessContext();
if (dup2(to.readSide.get(), STDIN_FILENO) == -1) if (dup2(to.readSide.get(), STDIN_FILENO) == -1)
throw SysError("cannot dup input pipe to stdin"); throw SysError("cannot dup input pipe to stdin");