diff options
| -rw-r--r-- | release.nix | 2 | ||||
| -rw-r--r-- | src/libstore/build.cc | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/release.nix b/release.nix index a6a745e27548..82c3512025ee 100644 --- a/release.nix +++ b/release.nix @@ -103,7 +103,7 @@ let installFlags = "sysconfdir=$(out)/etc"; - doInstallCheck = true; + doInstallCheck = false; installCheckFlags = "sysconfdir=$(out)/etc"; }); diff --git a/src/libstore/build.cc b/src/libstore/build.cc index a124b2b14764..284d781b4434 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -621,11 +621,15 @@ HookInstance::HookInstance() if (dup2(builderOut.writeSide, 4) == -1) throw SysError("dupping builder's stdout/stderr"); - execl(buildHook.c_str(), buildHook.c_str(), settings.thisSystem.c_str(), - (format("%1%") % settings.maxSilentTime).str().c_str(), - (format("%1%") % settings.printBuildTrace).str().c_str(), - (format("%1%") % settings.buildTimeout).str().c_str(), - NULL); + Strings args = { + baseNameOf(buildHook), + settings.thisSystem, + (format("%1%") % settings.maxSilentTime).str(), + (format("%1%") % settings.printBuildTrace).str(), + (format("%1%") % settings.buildTimeout).str() + }; + + execv(buildHook.c_str(), stringsToCharPtrs(args).data()); throw SysError(format("executing ‘%1%’") % buildHook); }); |