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

flake: fix passing additional args to makeWindowsImage

This commit is contained in:
mwojcik 2022-02-22 11:27:28 +08:00
parent dc36fd61d2
commit 94ca43da4b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flake.nix
View File

@ -21,11 +21,13 @@
''; '';
# makeWindowsImage # makeWindowsImage
makeWindowsImage = attrs: ( import wfvm/win.nix { inherit pkgs bundleInstaller; } // attrs ); makeWindowsImage = attrs: import wfvm/win.nix ({ inherit pkgs bundleInstaller; } // attrs );
build-demo-image = { impureMode ? false }: makeWindowsImage { build-demo-image = { impureMode ? false }: makeWindowsImage {
# Build install script & skip building iso # Build install script & skip building iso
inherit impureMode;
# Custom base iso # Custom base iso
# windowsImage = pkgs.requireFile rec { # windowsImage = pkgs.requireFile rec {
# name = "Win10_21H1_English_x64.iso"; # name = "Win10_21H1_English_x64.iso";
@ -57,14 +59,14 @@
# administratorPassword = "12345"; # administratorPassword = "12345";
# Imperative installation commands, to be installed incrementally # Imperative installation commands, to be installed incrementally
installCommands = with layers; [ installCommands = pkgs.lib.optional (!impureMode) (with layers; [
(collapseLayers [ (collapseLayers [
disable-autosleep disable-autosleep
disable-autolock disable-autolock
disable-firewall disable-firewall
]) ])
anaconda3 msys2 msvc msvc-ide-unbreak anaconda3 msys2 msvc msvc-ide-unbreak
]; ]);
# services = { # services = {
# # Enable remote management # # Enable remote management
@ -113,7 +115,7 @@
packages.x86_64-linux = { packages.x86_64-linux = {
demo-image = build-demo-image {}; demo-image = build-demo-image {};
demo-image-impure = build-demo-image { impureMode = true; }; demo-image-impure = makeWindowsImage { impureMode = true; };
make-msys-packages = utils.wfvm-run { make-msys-packages = utils.wfvm-run {
name = "get-msys-packages"; name = "get-msys-packages";