diff options
| author | Paul Colomiets <paul@colomiets.name> | 2014-07-12 22:51:28 +0300 |
|---|---|---|
| committer | Paul Colomiets <paul@colomiets.name> | 2014-07-28 01:15:03 +0300 |
| commit | fea8454d3515dbb5bb45be8763b34ad33342e705 (patch) | |
| tree | 7a652225644d642f189d178f610f55aa0cc6fb49 /pkgs/misc/my-env | |
| parent | e57249ab20f01041628842ea1d84eae15fa75dc8 (diff) | |
| download | nixpkgs-fea8454d3515dbb5bb45be8763b34ad33342e705.tar nixpkgs-fea8454d3515dbb5bb45be8763b34ad33342e705.tar.gz nixpkgs-fea8454d3515dbb5bb45be8763b34ad33342e705.tar.bz2 nixpkgs-fea8454d3515dbb5bb45be8763b34ad33342e705.tar.lz nixpkgs-fea8454d3515dbb5bb45be8763b34ad33342e705.tar.xz nixpkgs-fea8454d3515dbb5bb45be8763b34ad33342e705.tar.zst nixpkgs-fea8454d3515dbb5bb45be8763b34ad33342e705.zip | |
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
Diffstat (limited to 'pkgs/misc/my-env')
| -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 1aab4ac0208..2a990e8685c 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 "$@" |