diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 111d620b..5904df49 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -7,6 +7,9 @@ let cfg = config.nix; daemon = config.services.nix-daemon; + buildHook = if versionAtLeast (cfg.package.version or "") "1.12pre" + then "build-remote" else "build-remote.pl"; + nixConf = let # If we're using sandbox for builds, then provide /bin/sh in @@ -314,7 +317,7 @@ in environment.etc."nix/nix.conf".source = nixConf; # List of machines for distributed Nix builds in the format - # expected by build-remote.pl. + # expected by build-remote. environment.etc."nix/machines" = { enable = cfg.buildMachines != []; text = @@ -342,7 +345,7 @@ in } // optionalAttrs cfg.distributedBuilds { - NIX_BUILD_HOOK = "${cfg.package}/libexec/nix/build-remote.pl"; + NIX_BUILD_HOOK = "${cfg.package}/libexec/nix/${buildHook}"; NIX_REMOTE_SYSTEMS = "/etc/nix/machines"; NIX_CURRENT_LOAD = "/run/nix/current-load"; };