diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-11-17 15:39:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 15:39:14 +0100 |
| commit | 4dbd05e933ecb8652e30dfcae7682ce782aa738d (patch) | |
| tree | e0adce2af20341a2d9179b03ca59dad5b679b55a /src/nix/installables.cc | |
| parent | f89fd0bde7ada12c102a6bf7a1a15cbd45aef0b2 (diff) | |
| parent | 343239fc8a1993f707a990c2cd54a41f1fa3de99 (diff) | |
Merge pull request #4189 from edolstra/flake-config
Allow nix.conf options to be set in flake.nix
Diffstat (limited to 'src/nix/installables.cc')
| -rw-r--r-- | src/nix/installables.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nix/installables.cc b/src/nix/installables.cc index f385289e5..b6ed030af 100644 --- a/src/nix/installables.cc +++ b/src/nix/installables.cc @@ -560,8 +560,11 @@ InstallableFlake::getCursors(EvalState & state) std::shared_ptr<flake::LockedFlake> InstallableFlake::getLockedFlake() const { - if (!_lockedFlake) + if (!_lockedFlake) { _lockedFlake = std::make_shared<flake::LockedFlake>(lockFlake(*state, flakeRef, lockFlags)); + _lockedFlake->flake.config.apply(); + // FIXME: send new config to the daemon. + } return _lockedFlake; } |