Skip to content

Commit 212ff71

Browse files
committed
allow to build cli
this is useful for format scripts. A remote builder is still necessary
1 parent b2c95fb commit 212ff71

File tree

1 file changed

+16
-20
lines changed

1 file changed

+16
-20
lines changed

package.nix

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,28 @@ let
2121
installPhase = ''
2222
mkdir -p $out/bin $out/share/disko
2323
cp -r install-cli.nix cli.nix default.nix disk-deactivate lib $out/share/disko
24+
set -x
2425
25-
wrapProgram "$out/bin/disko" \
26-
--set DISKO_VERSION "${diskoVersion}" \
27-
--prefix NIX_PATH : "nixpkgs=${path}"
28-
--prefix PATH : ${
29-
lib.makeBinPath [
30-
nix
31-
coreutils
32-
]
33-
}
26+
scripts=(disko)
3427
${lib.optionalString (!stdenv.isDarwin) ''
35-
wrapProgram "$out/bin/disko" \
36-
--set DISKO_VERSION "${diskoVersion}" \
37-
--prefix NIX_PATH : "nixpkgs=${path}" \
38-
--prefix PATH : ${
39-
lib.makeBinPath [
40-
nix
41-
coreutils
42-
nixos-install-tools
43-
]
44-
} \
28+
scripts+=(disko-install)
4529
''}
4630
47-
for i in $out/bin/; do
31+
for i in "''${scripts[@]}"; do
4832
sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" "$i" > "$out/bin/$i"
4933
chmod 755 "$out/bin/$i"
34+
wrapProgram "$out/bin/$i" \
35+
--set DISKO_VERSION "${diskoVersion}" \
36+
--prefix NIX_PATH : "nixpkgs=${path}" \
37+
--prefix PATH : ${
38+
lib.makeBinPath (
39+
[
40+
nix
41+
coreutils
42+
]
43+
++ lib.optional (!stdenv.isDarwin) nixos-install-tools
44+
)
45+
}
5046
done
5147
'';
5248
# Otherwise resholve thinks that disko and disko-install might be able to execute their arguments

0 commit comments

Comments
 (0)