test build time with xcp

Author: Mic92

disko-install

@@ -235,7 +235,7 @@ main() {
   if [[ ! -d "${mountPoint}/nix/store" ]]; then
     echo "Copying store paths" >&2
     mkdir -p "${mountPoint}/nix/store"
-    xargs cp --recursive --target "${mountPoint}/nix/store"  < "${closure_info}/store-paths"
+    xargs xcp --recursive --target-directory "${mountPoint}/nix/store"  < "${closure_info}/store-paths"
     echo "Loading nix database" >&2
     NIX_STATE_DIR=${mountPoint}/nix/var/nix nix-store --load-db < "${closure_info}/registration"
   fi

package.nix

@@ -1,5 +1,16 @@
-{ stdenvNoCC, makeWrapper, lib, path, nix, coreutils, nixos-install-tools }:
+{ stdenvNoCC, makeWrapper, lib, path, nix, coreutils, nixos-install-tools, fetchpatch, xcp }:
 
+let
+  xcp' = xcp.overrideAttrs (old: {
+    # https://github.com/tarka/xcp/pull/56
+    patches = (old.patches or []) ++ [
+      (fetchpatch {
+        url = "https://github.com/tarka/xcp/commit/8c00cef85c4ae6ffa4f49a59e5f64f68f6407000.patch";
+        sha256 = "sha256-pwgtA/36YPRtpn4jmOcb44xjiDfEKmpXdJDSvqfGQuk=";
+      })
+    ];
+  });
+in
 stdenvNoCC.mkDerivation (finalAttrs: {
   name = "disko";
   src = ./.;
@@ -14,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" "$i" > "$out/bin/$i"
       chmod 755 "$out/bin/$i"
       wrapProgram "$out/bin/$i" \
-        --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install-tools ]} \
+        --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install-tools xcp' ]} \
         --prefix NIX_PATH : "nixpkgs=${path}"
     done
   '';