diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 81e0ab9..bab8287 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -5,7 +5,9 @@ with lib; let cfg = config.nix; - buildHook = if versionAtLeast (cfg.package.version or "") "1.12pre" + nixVersionAtLeast = versionAtLeast (cfg.package.version or ""); + + buildHook = if nixVersionAtLeast "1.12pre" then "build-remote" else "build-remote.pl"; nixConf = @@ -318,6 +320,8 @@ in (mkIf (!cfg.distributedBuilds && cfg.buildMachines != []) "nix.distributedBuilds is not enabled, build machines won't be configured.") ]; + nix.requireSignedBinaryCaches = mkIf (nixVersionAtLeast "2.0pre") false; + nix.binaryCaches = mkAfter [ https://cache.nixos.org/ ]; nix.binaryCachePublicKeys = mkAfter [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];