From fea8454d3515dbb5bb45be8763b34ad33342e705 Mon Sep 17 00:00:00 2001 From: Paul Colomiets Date: Sat, 12 Jul 2014 22:51:28 +0300 Subject: my-env: Preserve http_proxy and ftp_proxy variables There are few build scripts which set them to `nodtd.invalid` to disable downloading files by buildscript. But for user environment we should restore original values --- pkgs/misc/my-env/loadenv.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/misc') diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh index 1aab4ac0208f..2a990e8685c3 100644 --- a/pkgs/misc/my-env/loadenv.sh +++ b/pkgs/misc/my-env/loadenv.sh @@ -2,6 +2,8 @@ OLDPATH="$PATH" OLDTZ="$TZ" +OLD_http_proxy="$http_proxy" +OLD_ftp_proxy="$http_proxy" source @myenvpath@ PATH="$PATH:$OLDPATH" @@ -10,6 +12,8 @@ export NIX_MYENV_NAME="@name@" export buildInputs export NIX_STRIP_DEBUG=0 export TZ="$OLDTZ" +export http_proxy="$OLD_http_proxy" +export ftp_proxy="$OLD_ftp_proxy" if test $# -gt 0; then exec "$@" -- cgit 1.4.1