Merge pull request NixOS#10067 from ramboman/fix-proxy-nix

`nix`: Fix `haveInternet` to check for proxy
obsidiansystems · Feb 23, 2024 · accae60 · accae60
2 parents 6a5210f + bca737d
commit accae60
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/src/nix/main.cc b/src/nix/main.cc
@@ -32,6 +32,24 @@ void chrootHelper(int argc, char * * argv);
 
 namespace nix {
 
+static bool haveProxyEnvironmentVariables()
+{
+    static const std::vector<std::string> proxyVariables = {
+        "http_proxy",
+        "https_proxy",
+        "ftp_proxy",
+        "HTTP_PROXY",
+        "HTTPS_PROXY",
+        "FTP_PROXY"
+    };
+    for (auto & proxyVariable: proxyVariables) {
+        if (getEnv(proxyVariable).has_value()) {
+            return true;
+        }
+    }
+    return false;
+}
+
 /* Check if we have a non-loopback/link-local network interface. */
 static bool haveInternet()
 {
@@ -55,6 +73,8 @@ static bool haveInternet()
         }
     }
 
+    if (haveProxyEnvironmentVariables()) return true;
+
     return false;
 }