diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-03-03 15:42:53 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-03-03 16:50:26 +0100 |
| commit | 3070c887987e9c24a72a5b7b18db29ebe1ed6d4c (patch) | |
| tree | bac3583a5af4893205678912cb10b257d3a3b73c /nixos/modules/services/misc/nix-daemon.nix | |
| parent | 136f77b7b974f41362eddb750aae7ec9cb4c0a86 (diff) | |
| download | nixpkgs-3070c887987e9c24a72a5b7b18db29ebe1ed6d4c.tar nixpkgs-3070c887987e9c24a72a5b7b18db29ebe1ed6d4c.tar.gz nixpkgs-3070c887987e9c24a72a5b7b18db29ebe1ed6d4c.tar.bz2 nixpkgs-3070c887987e9c24a72a5b7b18db29ebe1ed6d4c.tar.lz nixpkgs-3070c887987e9c24a72a5b7b18db29ebe1ed6d4c.tar.xz nixpkgs-3070c887987e9c24a72a5b7b18db29ebe1ed6d4c.tar.zst nixpkgs-3070c887987e9c24a72a5b7b18db29ebe1ed6d4c.zip | |
Fix incorrect $NIX_BUILD_HOOK on Nix 1.12
Diffstat (limited to 'nixos/modules/services/misc/nix-daemon.nix')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 7101cadfeed..66ee20b5ac9 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -389,7 +389,11 @@ in } // optionalAttrs cfg.distributedBuilds { - NIX_BUILD_HOOK = "${nix}/libexec/nix/build-remote.pl"; + NIX_BUILD_HOOK = + if versionAtLeast (getVersion nix) "1.12pre4997" then + "${nix}/libexec/nix/build-remote" + else + "${nix}/libexec/nix/build-remote.pl"; NIX_REMOTE_SYSTEMS = "/etc/nix/machines"; NIX_CURRENT_LOAD = "/run/nix/current-load"; }; |