diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-03-01 01:29:34 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-03-01 01:39:25 +0000 |
commit | ea71da395fe23fc0b4adb6fe5075742441e8baf8 (patch) | |
tree | 87a6b57e5b031e66db781fc7c5bc97facb7584d2 /src/libexpr/flake/config.cc | |
parent | 1c985428c4783568bcfb4692c6ce816eb5c5c31d (diff) |
Move some stuff from `Settings` to a new `FetchSettings`.
Starting work on #5638
The exact boundary between `FetchSettings` and `EvalSettings` is not
clear to me, but that's fine. First lets clean out `libstore`, and then
worry about what, if anything, should be the separation between those
two.
Diffstat (limited to 'src/libexpr/flake/config.cc')
-rw-r--r-- | src/libexpr/flake/config.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libexpr/flake/config.cc b/src/libexpr/flake/config.cc index 7ecd61816..a811e59a1 100644 --- a/src/libexpr/flake/config.cc +++ b/src/libexpr/flake/config.cc @@ -1,5 +1,6 @@ #include "flake.hh" #include "globals.hh" +#include "fetch-settings.hh" #include <nlohmann/json.hpp> @@ -53,7 +54,7 @@ void ConfigFile::apply() auto trustedList = readTrustedList(); bool trusted = false; - if (nix::settings.acceptFlakeConfig){ + if (nix::fetchSettings.acceptFlakeConfig){ trusted = true; } else if (auto saved = get(get(trustedList, name).value_or(std::map<std::string, bool>()), valueS)) { trusted = *saved; |