diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-04-22 15:48:52 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-04-22 17:50:40 +0300 |
| commit | 97931361d739fa2d28f5d583f594e85a8611e5a7 (patch) | |
| tree | 61d2bd24362b4737ab757acefec6c6730edddcfa /pkgs/build-support | |
| parent | de487c5c990f751a8e66a4eb2621cb16e7a0a092 (diff) | |
| download | nixlib-97931361d739fa2d28f5d583f594e85a8611e5a7.tar nixlib-97931361d739fa2d28f5d583f594e85a8611e5a7.tar.gz nixlib-97931361d739fa2d28f5d583f594e85a8611e5a7.tar.bz2 nixlib-97931361d739fa2d28f5d583f594e85a8611e5a7.tar.lz nixlib-97931361d739fa2d28f5d583f594e85a8611e5a7.tar.xz nixlib-97931361d739fa2d28f5d583f594e85a8611e5a7.tar.zst nixlib-97931361d739fa2d28f5d583f594e85a8611e5a7.zip | |
fhs-userenv: refactor envvars and propagate SSL_CERT_FILE
Diffstat (limited to 'pkgs/build-support')
| -rwxr-xr-x | pkgs/build-support/build-fhs-userenv/chroot-user.rb | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb index 3e140fac97e2..357a743c9937 100755 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb @@ -17,6 +17,15 @@ mounts = [ ['/nix/store', nil], mkdirs = ['tmp', ] +# Propagate environment variables +envvars = [ 'TERM', + 'DISPLAY', + 'HOME', + 'XDG_RUNTIME_DIR', + 'LANG', + 'SSL_CERT_FILE', + ] + require 'tmpdir' require 'fileutils' require 'pathname' @@ -120,12 +129,7 @@ if $cpid == 0 link_swdir.call swdir, Pathname.new('') # New environment - ENV.replace({ 'TERM' => ENV['TERM'], - 'DISPLAY' => ENV['DISPLAY'], - 'HOME' => ENV['HOME'], - 'XDG_RUNTIME_DIR' => ENV['XDG_RUNTIME_DIR'], - 'LANG' => ENV['LANG'], - }) + ENV.replace(Hash[ envvars.map { |x| [x, ENV[x]] } ]) # Finally, exec! exec *execp |