Merge pull request #3257 from tailhook/myenv-proxy
my-env: Preserve http_proxy and ftp_proxy variables
This commit is contained in:
commit
4d95ac6102
1 changed files with 4 additions and 0 deletions
|
@ -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 "$@"
|
||||
|
|
Loading…
Reference in a new issue