diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-20 00:05:21 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-20 00:05:21 +0100 |
| commit | 24d4d6fdd67561e0de4b1cea6380e43e63d69646 (patch) | |
| tree | 9c3f946b6e7c3d67af44cdcd9710ad8320e90080 /nix/nix-daemon/nix-daemon.cc | |
| parent | 92982ecca4efe857666d8b94ad95d2cc7d2ab54b (diff) | |
| parent | a512bbd23a2e129cf3d8e71255d504ce8bac77d3 (diff) | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'nix/nix-daemon/nix-daemon.cc')
| -rw-r--r-- | nix/nix-daemon/nix-daemon.cc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc index 497de11a04..4cb05c802e 100644 --- a/nix/nix-daemon/nix-daemon.cc +++ b/nix/nix-daemon/nix-daemon.cc @@ -736,6 +736,23 @@ static void performOp(bool trusted, unsigned int clientVersion, break; } + case wopSubstituteURLs: { + startWork(); + Strings urls; + if (settings.get("build-use-substitutes", std::string("false")) == "true") { + /* First check the client-provided substitute URLs, then those + passed to the daemon. */ + auto str = settings.get("untrusted-substitute-urls", std::string("")); + if (str.empty()) { + str = settings.get("substitute-urls", std::string("")); + } + urls = tokenizeString<Strings>(str); + } + stopWork(); + writeStrings(urls, to); + break; + } + default: throw Error(format("invalid operation %1%") % op); } |