diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-11 17:40:39 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-11 17:40:39 +0100 |
commit | 97ae408e8380dce872789dc26cbc69ec1962eb21 (patch) | |
tree | a2681f00f06888f71d96ad487c735cc01f87ac5f /modules/services/misc/nix-daemon.nix | |
parent | 3224ea8a1e394d9189bed3c073294e20ff1591c9 (diff) | |
parent | 78bd54ca804a3494257c57153520d49025804238 (diff) | |
download | nixpkgs-97ae408e8380dce872789dc26cbc69ec1962eb21.tar nixpkgs-97ae408e8380dce872789dc26cbc69ec1962eb21.tar.gz nixpkgs-97ae408e8380dce872789dc26cbc69ec1962eb21.tar.bz2 nixpkgs-97ae408e8380dce872789dc26cbc69ec1962eb21.tar.lz nixpkgs-97ae408e8380dce872789dc26cbc69ec1962eb21.tar.xz nixpkgs-97ae408e8380dce872789dc26cbc69ec1962eb21.tar.zst nixpkgs-97ae408e8380dce872789dc26cbc69ec1962eb21.zip |
Merge remote-tracking branch 'origin/master' into systemd
Diffstat (limited to 'modules/services/misc/nix-daemon.nix')
-rw-r--r-- | modules/services/misc/nix-daemon.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix index 5af2d19a839..49aa8e7931f 100644 --- a/modules/services/misc/nix-daemon.nix +++ b/modules/services/misc/nix-daemon.nix @@ -247,8 +247,8 @@ in build-max-jobs = ${toString (cfg.maxJobs)} build-use-chroot = ${if cfg.useChroot then "true" else "false"} build-chroot-dirs = ${toString cfg.chrootDirs} $(echo $extraPaths) - binary-caches = ${toString config.nix.binaryCaches} - trusted-binary-caches = ${toString config.nix.trustedBinaryCaches} + binary-caches = ${toString cfg.binaryCaches} + trusted-binary-caches = ${toString cfg.trustedBinaryCaches} $extraOptions END ''; |