diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-10-01 16:26:13 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-10-01 16:37:51 +0200 |
| commit | d3941dc5ecbb1582fa6df90283f072bd8c1f2134 (patch) | |
| tree | bc8992249119a59e37d438e30a456448bde805d1 | |
| parent | c8cc548dfc53cd2f100d64cab3c50e86486e2fd0 (diff) | |
nix: use old default for nix.nixPath with system.stateVersion = 1
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | modules/nix/default.nix | 6 |
2 files changed, 8 insertions, 1 deletions
@@ -11,7 +11,8 @@ programs.nix-index.enable = true; 2017-07-23 -- darwin entry in the default nix.nixPath was removed +- darwin entry in the default nix.nixPath was removed for + system.stateVersion > 1 Use a channel for nix-darwin or configure nix.nixPath diff --git a/modules/nix/default.nix b/modules/nix/default.nix index eea899c..c826713 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -304,6 +304,12 @@ in nix.binaryCaches = mkAfter [ https://cache.nixos.org/ ]; nix.binaryCachePublicKeys = mkAfter [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; + nix.nixPath = mkIf (config.system.stateVersion < 2) (mkDefault + [ "darwin=$HOME/.nix-defexpr/darwin" + "darwin-config=$HOME/.nixpkgs/darwin-configuration.nix" + "/nix/var/nix/profiles/per-user/root/channels" + ]); + environment.etc."nix/nix.conf".source = nixConf; # List of machines for distributed Nix builds in the format |