wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity

Honor the same set of proxy environment variables (#10611)

Browse source 
Different parts of the project honor different sets of proxy environment
variables. With this commit all parts of the project will honor the same
set of proxy environment variables.

---------

Co-authored-by: Your Name <you@example.com>
Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>
This commit is contained in:
ramboman 2024-05-06 19:39:22 +00:00 • committed by GitHub
parent da3381d51f
commit b4950404ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 76 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/nix-build/nix-build.cc
View file

@ -25,6 +25,7 @@
#include "attr-path.hh"
#include "legacy.hh"
#include "users.hh"
#include "network-proxy.hh"
using namespace nix;
using namespace std::string_literals;
@ -121,8 +122,8 @@ static void main_nix_build(int argc, char * * argv)
"HOME", "XDG_RUNTIME_DIR", "USER", "LOGNAME", "DISPLAY",
"WAYLAND_DISPLAY", "WAYLAND_SOCKET", "PATH", "TERM", "IN_NIX_SHELL",
"NIX_SHELL_PRESERVE_PROMPT", "TZ", "PAGER", "NIX_BUILD_SHELL", "SHLVL",
"http_proxy", "https_proxy", "ftp_proxy", "all_proxy", "no_proxy"
};
keepVars.insert(networkProxyVariables.begin(), networkProxyVariables.end());
Strings args;
for (int i = 1; i < argc; ++i)