make-disk-image: also use xcp

Author: Mic92

lib/make-disk-image.nix

@@ -3,6 +3,7 @@
 , lib
 , extendModules
 , options
+, pkgs
 , ...
 }:
 let
@@ -11,6 +12,10 @@ let
   inherit (cfg) pkgs imageFormat;
   checked = diskoCfg.checkScripts;
 
+  xcp' = pkgs.callPackage ../xcp.nix {
+    inherit (pkgs) xcp;
+  };
+
   configSupportsZfs = config.boot.supportedFilesystems.zfs or false;
   vmTools = pkgs.vmTools.override
     {
@@ -46,6 +51,7 @@ let
     util-linux
     findutils
     kmod
+    xcp'
   ] ++ cfg.extraDependencies;
   preVM = ''
     ${lib.concatMapStringsSep "\n" (disk: "${pkgs.qemu}/bin/qemu-img create -f ${imageFormat} ${disk.imageName}.${imageFormat} ${disk.imageSize}") (lib.attrValues diskoCfg.devices.disk)}
@@ -94,7 +100,7 @@ let
 
     # We copy files with cp because `nix copy` seems to have a large memory leak
     mkdir -p ${systemToInstall.config.disko.rootMountPoint}/nix/store
-    xargs cp --recursive --target ${systemToInstall.config.disko.rootMountPoint}/nix/store < ${closureInfo}/store-paths
+    xargs xcp --recursive --target-directory ${systemToInstall.config.disko.rootMountPoint}/nix/store < ${closureInfo}/store-paths
 
     ${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 ""
     umount -Rv ${systemToInstall.config.disko.rootMountPoint}