Skip to content

Commit 6e89b49

Browse files
committed
disko-install: switch to xcp
1 parent 65a4415 commit 6e89b49

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

disko-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ main() {
256256
if [[ ! -f "${mountPoint}/nix/var/nix/db/db.sqlite" ]]; then
257257
echo "Copying store paths" >&2
258258
mkdir -p "${mountPoint}/nix/store"
259-
xargs cp --recursive --target "${mountPoint}/nix/store" < "${closure_info}/store-paths"
259+
xargs xcp --recursive --target-directory "${mountPoint}/nix/store" < "${closure_info}/store-paths"
260260
echo "Loading nix database" >&2
261261
NIX_STATE_DIR=${mountPoint}/nix/var/nix nix-store --load-db < "${closure_info}/registration"
262262
fi

package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenvNoCC, makeWrapper, lib, path, nix, coreutils, nixos-install-tools, binlore, diskoVersion }:
1+
{ stdenvNoCC, makeWrapper, lib, path, nix, coreutils, nixos-install-tools, binlore, diskoVersion, xcp }:
22

33
let
44
self = stdenvNoCC.mkDerivation (finalAttrs: {
@@ -16,7 +16,7 @@ let
1616
chmod 755 "$out/bin/$i"
1717
wrapProgram "$out/bin/$i" \
1818
--set DISKO_VERSION "${diskoVersion}" \
19-
--prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install-tools ]} \
19+
--prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install-tools xcp ]} \
2020
--prefix NIX_PATH : "nixpkgs=${path}"
2121
done
2222
'';

0 commit comments

Comments
 (0)