diff options
| author | Antoine R. Dumont <antoine.romain.dumont@gmail.com> | 2014-11-29 20:53:13 +0100 |
|---|---|---|
| committer | Luca Bruno <lucabru@src.gnome.org> | 2014-11-30 15:19:30 +0100 |
| commit | e54f9ffcf45529c701c833501a0f6461a1d93e6b (patch) | |
| tree | f311b24983cbe83b80f2a637b784736e8a26c88a /nixos/modules/services/misc | |
| parent | 3c7e77960282dcf550fc2df8445c7da3ee27fb3c (diff) | |
| download | nixlib-e54f9ffcf45529c701c833501a0f6461a1d93e6b.tar nixlib-e54f9ffcf45529c701c833501a0f6461a1d93e6b.tar.gz nixlib-e54f9ffcf45529c701c833501a0f6461a1d93e6b.tar.bz2 nixlib-e54f9ffcf45529c701c833501a0f6461a1d93e6b.tar.lz nixlib-e54f9ffcf45529c701c833501a0f6461a1d93e6b.tar.xz nixlib-e54f9ffcf45529c701c833501a0f6461a1d93e6b.tar.zst nixlib-e54f9ffcf45529c701c833501a0f6461a1d93e6b.zip | |
Ensure nix-daemon sees the proxy defined options
(Not sure about this one) Here are the incomplete and a little contradictory discussions about it (or at least my interpretations of them): - https://github.com/NixOS/nixpkgs/pull/5058#discussion_r20830855 - https://github.com/NixOS/nixpkgs/pull/5058#discussion_r21043552 cc @edolstra @wmertens What did I get wrong?
Diffstat (limited to 'nixos/modules/services/misc')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index f8f99be9b099..d041c5664ef6 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -281,7 +281,9 @@ in { path = [ nix pkgs.openssl pkgs.utillinux pkgs.openssh ] ++ optionals cfg.distributedBuilds [ pkgs.gzip ]; - environment = cfg.envVars // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; }; + environment = cfg.envVars + // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; } + // config.networking.proxy.envVars; serviceConfig = { Nice = cfg.daemonNiceLevel; |