diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-09-01 10:35:18 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-09-01 10:35:18 +0400 |
| commit | 4d95ac6102c2811c26a56b638e73a82c1c7c1035 (patch) | |
| tree | 04da4d091effa8cea9a8528354c3ffb80b4eb66c | |
| parent | 9e3d1b1a8f1c2401e360183f96d55a0b27d72f00 (diff) | |
| parent | fea8454d3515dbb5bb45be8763b34ad33342e705 (diff) | |
| download | nixlib-4d95ac6102c2811c26a56b638e73a82c1c7c1035.tar nixlib-4d95ac6102c2811c26a56b638e73a82c1c7c1035.tar.gz nixlib-4d95ac6102c2811c26a56b638e73a82c1c7c1035.tar.bz2 nixlib-4d95ac6102c2811c26a56b638e73a82c1c7c1035.tar.lz nixlib-4d95ac6102c2811c26a56b638e73a82c1c7c1035.tar.xz nixlib-4d95ac6102c2811c26a56b638e73a82c1c7c1035.tar.zst nixlib-4d95ac6102c2811c26a56b638e73a82c1c7c1035.zip | |
Merge pull request #3257 from tailhook/myenv-proxy
my-env: Preserve http_proxy and ftp_proxy variables
| -rw-r--r-- | pkgs/misc/my-env/loadenv.sh | 4 |
1 files changed, 4 insertions, 0 deletions
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 "$@" |