diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-26 12:11:17 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-26 12:14:14 +0200 |
| commit | 8bfbe7ef84df37c933fb26a15bb3d3f8212f17cf (patch) | |
| tree | f5ed611b97d3be6de85ead2147c3f0085dd478a5 /modules/services/misc/nix-daemon.nix | |
| parent | c3931d2e4273c9bf5a610ccd664f56bd05e584cf (diff) | |
| download | nixpkgs-8bfbe7ef84df37c933fb26a15bb3d3f8212f17cf.tar nixpkgs-8bfbe7ef84df37c933fb26a15bb3d3f8212f17cf.tar.gz nixpkgs-8bfbe7ef84df37c933fb26a15bb3d3f8212f17cf.tar.bz2 nixpkgs-8bfbe7ef84df37c933fb26a15bb3d3f8212f17cf.tar.lz nixpkgs-8bfbe7ef84df37c933fb26a15bb3d3f8212f17cf.tar.xz nixpkgs-8bfbe7ef84df37c933fb26a15bb3d3f8212f17cf.tar.zst nixpkgs-8bfbe7ef84df37c933fb26a15bb3d3f8212f17cf.zip | |
Don't try to guess the location of the NixOS config file
The NixOS config need not be $NIXOS_CONFIG, it can also be set through -I nixos-config=... or not exist in a separate file at all (e.g. in a NixOps deployment). Issue #212.
Diffstat (limited to 'modules/services/misc/nix-daemon.nix')
| -rw-r--r-- | modules/services/misc/nix-daemon.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix index e77a9dc2e4b..58fb3322c20 100644 --- a/modules/services/misc/nix-daemon.nix +++ b/modules/services/misc/nix-daemon.nix @@ -34,8 +34,9 @@ let pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } '' extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) cat > $out <<END - # WARNING: this file is generated from the nix.* entries in - # ${maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} + # WARNING: this file is generated from the nix.* options in + # your NixOS configuration, typically + # /etc/nixos/configuration.nix. Do not edit it! build-users-group = nixbld build-max-jobs = ${toString (cfg.maxJobs)} build-use-chroot = ${if cfg.useChroot then "true" else "false"} |