From 3b87f787a8eb9ad7fd99d2090114dd5d97fbf0f3 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 5 Oct 2022 16:46:27 +0200 Subject: [PATCH] s/runCommandNoCC/runCommand/ --- wfvm/autounattend.nix | 2 +- wfvm/bundle/default.nix | 2 +- wfvm/win.nix | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wfvm/autounattend.nix b/wfvm/autounattend.nix index 99b0429..95ce44a 100644 --- a/wfvm/autounattend.nix +++ b/wfvm/autounattend.nix @@ -305,7 +305,7 @@ let in { # Lint and format as a sanity check - autounattendXML = pkgs.runCommandNoCC "autounattend.xml" {} '' + autounattendXML = pkgs.runCommand "autounattend.xml" {} '' ${pkgs.libxml2}/bin/xmllint --format ${autounattendXML} > $out ''; diff --git a/wfvm/bundle/default.nix b/wfvm/bundle/default.nix index 16a0fed..c3bc5ab 100644 --- a/wfvm/bundle/default.nix +++ b/wfvm/bundle/default.nix @@ -1,6 +1,6 @@ { pkgs }: -pkgs.runCommandNoCC "win-bundle-installer.exe" {} '' +pkgs.runCommand "win-bundle-installer.exe" {} '' mkdir bundle cd bundle cp ${./go.mod} go.mod diff --git a/wfvm/win.nix b/wfvm/win.nix index 5d89cb4..820e669 100644 --- a/wfvm/win.nix +++ b/wfvm/win.nix @@ -24,7 +24,7 @@ let }); runQemuCommand = name: command: ( - pkgs.runCommandNoCC name { buildInputs = [ p7zip utils.qemu libguestfs ]; } + pkgs.runCommand name { buildInputs = [ p7zip utils.qemu libguestfs ]; } ( '' if ! test -f; then @@ -138,12 +138,12 @@ let '' ); - baseImage = pkgs.runCommandNoCC "RESTRICTDIST-windows.img" {} '' + baseImage = pkgs.runCommand "RESTRICTDIST-windows.img" {} '' ${installScript} 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; [ qemu win-wait win-exec win-put ] ++ (v.buildInputs or []);