diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 16:28:04 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:57 +0100 |
| commit | 259f7a93b1e679b73026352b40029375aa94db7c (patch) | |
| tree | 353259f8f7622375aa0a584e31ad16c20f95a6a3 /nixos/modules/services/misc/nix-daemon.nix | |
| parent | 44d6d887390bbf0fd99d2bf95d75e6292357fd50 (diff) | |
| download | nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.tar nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.tar.gz nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.tar.bz2 nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.tar.lz nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.tar.xz nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.tar.zst nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.zip | |
Rename environment.nix -> nix.package
Diffstat (limited to 'nixos/modules/services/misc/nix-daemon.nix')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index d78c7fe2822..441b8606b01 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -6,7 +6,7 @@ let cfg = config.nix; - inherit (config.environment) nix; + nix = cfg.package; makeNixBuildUser = nr: { name = "nixbld${toString nr}"; @@ -55,16 +55,16 @@ in options = { - environment.nix = mkOption { - type = types.path; - default = pkgs.nix; - description = '' - This option specifies the Nix package instance to use throughout the system. - ''; - }; - nix = { + package = mkOption { + type = types.path; + default = pkgs.nix; + description = '' + This option specifies the Nix package instance to use throughout the system. + ''; + }; + maxJobs = mkOption { default = 1; example = 2; @@ -302,7 +302,7 @@ in } // optionalAttrs cfg.distributedBuilds { - NIX_BUILD_HOOK = "${config.environment.nix}/libexec/nix/build-remote.pl"; + NIX_BUILD_HOOK = "${nix}/libexec/nix/build-remote.pl"; NIX_REMOTE_SYSTEMS = "/etc/nix/machines"; NIX_CURRENT_LOAD = "/run/nix/current-load"; } |