diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-16 13:28:59 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-16 13:30:34 +0200 |
| commit | 533248045446ffab4939a7cf8fa3fdd500326abc (patch) | |
| tree | f3b10ba4403ab9aa368db92335e25830456a9ba6 /modules | |
| parent | 639bb95d0a4f99cc15375ec437a3c0013aaf6194 (diff) | |
| download | nixlib-533248045446ffab4939a7cf8fa3fdd500326abc.tar nixlib-533248045446ffab4939a7cf8fa3fdd500326abc.tar.gz nixlib-533248045446ffab4939a7cf8fa3fdd500326abc.tar.bz2 nixlib-533248045446ffab4939a7cf8fa3fdd500326abc.tar.lz nixlib-533248045446ffab4939a7cf8fa3fdd500326abc.tar.xz nixlib-533248045446ffab4939a7cf8fa3fdd500326abc.tar.zst nixlib-533248045446ffab4939a7cf8fa3fdd500326abc.zip | |
nixos-install: Fix copying from the CD
Nix 1.6 doesn't run the copy-from-other-stores substituter by default anymore, so turn it on explicitly. http://hydra.nixos.org/build/6144173
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/installer/tools/nixos-install.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh index 5ff28dcfec82..b7efcd2156ce 100644 --- a/modules/installer/tools/nixos-install.sh +++ b/modules/installer/tools/nixos-install.sh @@ -157,6 +157,9 @@ fi # /mnt in the chroot is the root of the CD. export NIX_OTHER_STORES=/mnt/nix:$NIX_OTHER_STORES +p=@nix@/libexec/nix/substituters +export NIX_SUBSTITUTERS=$p/copy-from-other-stores.pl:$p/download-from-binary-cache.pl + # Make manifests available in the chroot. rm -f $mountPoint/nix/var/nix/manifests/* |