From 61462c94e630cdfc6553eb9b0a0b0ad4f85f0b7a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 17 Sep 2016 21:50:01 +0200 Subject: lib/fetchers.nix: factor out impure proxy vars (#18702) Apparently everyone just copied those variables, instead of creating a library constant for them. Some even removed the comment. -.- --- pkgs/build-support/fetchgit/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'pkgs/build-support/fetchgit/default.nix') diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 7f98c97fc55..105b3d56bf4 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -56,13 +56,9 @@ stdenv.mkDerivation { GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - impureEnvVars = [ - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" "GIT_PROXY_COMMAND" "SOCKS_SERVER" - ]; + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" "SOCKS_SERVER" + ]; preferLocalBuild = true; } -- cgit 1.4.1