diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2019-04-30 12:46:54 +0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2019-04-30 12:46:54 +0200 |
commit | 4588a6ff3caed5ad30c83e2bc65e52a58176e71c (patch) | |
tree | d291bbbce41387200fb4beae730e9b5af0276452 /src/nix | |
parent | 33bd10549e077f9b4a490f540df979ee17ff69f7 (diff) | |
parent | 24b35bf9e7219feba9399466c41801f0ace3ef74 (diff) |
Merge remote-tracking branch 'tweag/flakeFlags' into flakes
Diffstat (limited to 'src/nix')
-rw-r--r-- | src/nix/build.cc | 2 | ||||
-rw-r--r-- | src/nix/flake.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nix/build.cc b/src/nix/build.cc index 07b6b2f02..c08ec0e62 100644 --- a/src/nix/build.cc +++ b/src/nix/build.cc @@ -54,7 +54,7 @@ struct CmdBuild : MixDryRun, InstallablesCommand auto buildables = build(store, dryRun ? DryRun : Build, installables); auto evalState = std::make_shared<EvalState>(searchPath, store); - + evalState->addRegistryOverrides(registryOverrides); if (dryRun) return; for (size_t i = 0; i < buildables.size(); ++i) { diff --git a/src/nix/flake.cc b/src/nix/flake.cc index a80338fd3..e38c4db0b 100644 --- a/src/nix/flake.cc +++ b/src/nix/flake.cc @@ -92,6 +92,7 @@ struct CmdFlakeDeps : FlakeCommand, MixJSON, StoreCommand, MixEvalArgs void run(nix::ref<nix::Store> store) override { auto evalState = std::make_shared<EvalState>(searchPath, store); + evalState->addRegistryOverrides(registryOverrides); FlakeRef flakeRef(flakeUri); |