File tree 2 files changed +2
-2
lines changed
2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -253,7 +253,7 @@ main() {
253
253
# nix copy uses up a lot of memory and we work around issues with incorrect checksums in our store
254
254
# that can be caused by using closureInfo in combination with multiple builders and non-deterministic builds.
255
255
# Therefore if we have a blank store, we copy the store paths and registration from the closureInfo.
256
- if [[ ! -d " ${mountPoint} /nix/store " ]]; then
256
+ if [[ ! -f " ${mountPoint} /nix/var/nix/db/db.sqlite " ]]; then
257
257
echo " Copying store paths" >&2
258
258
mkdir -p " ${mountPoint} /nix/store"
259
259
xargs cp --recursive --target " ${mountPoint} /nix/store" < " ${closure_info} /store-paths"
Original file line number Diff line number Diff line change 93
93
94
94
# We copy files with cp because `nix copy` seems to have a large memory leak
95
95
mkdir -p ${ systemToInstall . config . disko . rootMountPoint } /nix/store
96
- xargs cp --recursive --target ${ systemToInstall . config . disko . rootMountPoint } /nix/store < ${ closureInfo } /store-paths
96
+ time xargs cp --recursive --target ${ systemToInstall . config . disko . rootMountPoint } /nix/store < ${ closureInfo } /store-paths
97
97
98
98
${ systemToInstall . config . system . build . nixos-install } /bin/nixos-install --root ${ systemToInstall . config . disko . rootMountPoint } --system ${ systemToInstall . config . system . build . toplevel } --keep-going --no-channel-copy -v --no-root-password --option binary-caches ""
99
99
umount -Rv ${ systemToInstall . config . disko . rootMountPoint }
You can’t perform that action at this time.
0 commit comments