M-Labs
/
wfvm
8
0
Fork 5
Code Issues 4 Pull Requests 2 Releases Wiki Activity

s/runCommandNoCC/runCommand/

This commit is contained in:
Astro 2022-10-05 16:46:27 +02:00
parent b33b71eec7
commit 3b87f787a8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wfvm/autounattend.nix
View File

@ -305,7 +305,7 @@ let
in { in {
# Lint and format as a sanity check # Lint and format as a sanity check
autounattendXML = pkgs.runCommandNoCC "autounattend.xml" {} '' autounattendXML = pkgs.runCommand "autounattend.xml" {} ''
${pkgs.libxml2}/bin/xmllint --format ${autounattendXML} > $out ${pkgs.libxml2}/bin/xmllint --format ${autounattendXML} > $out
''; '';

2
wfvm/bundle/default.nix
View File

@ -1,6 +1,6 @@
{ pkgs }: { pkgs }:
pkgs.runCommandNoCC "win-bundle-installer.exe" {} '' pkgs.runCommand "win-bundle-installer.exe" {} ''
mkdir bundle mkdir bundle
cd bundle cd bundle
cp ${./go.mod} go.mod cp ${./go.mod} go.mod

6
wfvm/win.nix
View File

@ -24,7 +24,7 @@ let
}); });
runQemuCommand = name: command: ( runQemuCommand = name: command: (
pkgs.runCommandNoCC name { buildInputs = [ p7zip utils.qemu libguestfs ]; } pkgs.runCommand name { buildInputs = [ p7zip utils.qemu libguestfs ]; }
( (
'' ''
if ! test -f; then if ! test -f; then
@ -138,12 +138,12 @@ let
'' ''
); );
baseImage = pkgs.runCommandNoCC "RESTRICTDIST-windows.img" {} '' baseImage = pkgs.runCommand "RESTRICTDIST-windows.img" {} ''
${installScript} ${installScript}
mv c.img $out mv c.img $out
''; '';
finalImage = builtins.foldl' (acc: v: pkgs.runCommandNoCC "RESTRICTDIST-${v.name}.img" { finalImage = builtins.foldl' (acc: v: pkgs.runCommand "RESTRICTDIST-${v.name}.img" {
buildInputs = with utils; [ buildInputs = with utils; [
qemu win-wait win-exec win-put qemu win-wait win-exec win-put
] ++ (v.buildInputs or []); ] ++ (v.buildInputs or []);