picnoir/nix-gh
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't run pre-build-hook if we don't have a derivation

Browse source 
This fixes a build failure on OS X when using Hydra or Nix 1.12's
build-remote (since they don't copy the derivation to the build
machine).

(cherry picked from commit 7f5b750b40)
This commit is contained in:
Eelco Dolstra 2017-06-12 16:07:34 +02:00
parent c20641ce56
commit 0be5b949d3
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build.cc
View file

@ -2121,7 +2121,7 @@ void DerivationGoal::startBuilder()
} }
} }
if (settings.preBuildHook != "") { if (useChroot && settings.preBuildHook != "" && dynamic_cast<Derivation *>(drv.get())) {
printMsg(lvlChatty, format("executing pre-build hook ‘%1%’") printMsg(lvlChatty, format("executing pre-build hook ‘%1%’")
% settings.preBuildHook); % settings.preBuildHook);
auto args = useChroot ? Strings({drvPath, chrootRootDir}) : auto args = useChroot ? Strings({drvPath, chrootRootDir}) :