wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-30 07:33:16 +02:00
Code Activity

Enable recursive Nix using a feature

Browse source 
Derivations that want to use recursion should now set

  requiredSystemFeatures = [ "recursive-nix" ];

to make the daemon socket appear.

Also, Nix should be configured with "experimental-features =
recursive-nix".
This commit is contained in:
Eelco Dolstra 2019-11-04 13:48:58 +01:00
parent 2af9561316
commit c119ab9db0
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/build.cc
View file

@ -2248,7 +2248,8 @@ void DerivationGoal::startBuilder()
/* Fire up a Nix daemon to process recursive Nix calls from the
builder. */
startDaemon();
if (parsedDrv->getRequiredSystemFeatures().count("recursive-nix"))
startDaemon();
/* Run the builder. */
printMsg(lvlChatty, format("executing builder '%1%'") % drv->builder);
@ -2832,6 +2833,8 @@ struct RestrictedStore : public LocalFSStore
void DerivationGoal::startDaemon()
{
settings.requireExperimentalFeature("recursive-nix");
Store::Params params;
params["path-info-cache-size"] = "0";
params["store"] = worker.store.storeDir;