diff --git a/src/nix/main.cc b/src/nix/main.cc index 687c072e0..5af5f2e41 100644 --- a/src/nix/main.cc +++ b/src/nix/main.cc @@ -23,7 +23,6 @@ #include #include #include -#include #include @@ -35,7 +34,7 @@ namespace nix { static bool haveProxyEnvironmentVariables() { - static const char * const proxyVariables[] = { + static const std::vector proxyVariables = { "http_proxy", "https_proxy", "ftp_proxy", @@ -44,7 +43,7 @@ static bool haveProxyEnvironmentVariables() "FTP_PROXY" }; for (auto & proxyVariable: proxyVariables) { - if (std::getenv(proxyVariable)) { + if (getEnv(proxyVariable).has_value()) { return true; } }