mirror of
https://github.com/LnL7/nix-darwin.git
synced 2024-09-11 12:49:18 +03:00
services/nix-daemon: default environmentVariables to config.nix.envVars
The new `services.nix-daemon.environmentVariables` seems more idiomatic so let's gracefully deprecate `config.nix.envVars` (which was only ever used here).
This commit is contained in:
parent
758f62d39d
commit
daba515ea4
@ -22,7 +22,9 @@ in
|
||||
|
||||
services.nix-daemon.environmentVariables = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
default = { };
|
||||
default =
|
||||
# See https://github.com/LnL7/nix-darwin/commit/a9e0f71c50fc9a72e22e991e323a6a7e50bfc0d7.
|
||||
config.nix.envVars;
|
||||
example = {
|
||||
AWS_CONFIG_FILE = "/etc/nix/aws/config";
|
||||
AWS_SHARED_CREDENTIALS_FILE = "/etc/nix/aws/credentials";
|
||||
@ -74,7 +76,6 @@ in
|
||||
|
||||
serviceConfig.EnvironmentVariables = mkMerge [
|
||||
cfg.environmentVariables
|
||||
config.nix.envVars
|
||||
{
|
||||
NIX_SSL_CERT_FILE = mkIf
|
||||
(config.environment.variables ? NIX_SSL_CERT_FILE)
|
||||
|
Loading…
Reference in New Issue
Block a user