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

utils.nix: pass all attrs #17

Merged
sb10q merged 2 commits from astro/wfvm:pass-attrs into master 2023-06-29 09:49:57 +08:00
Conversation 0 Commits 2 Files Changed 3 +4 -3
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wfvm/default.nix
View File

@ -2,6 +2,6 @@
{ {
makeWindowsImage = attrs: import ./win.nix ({ inherit pkgs; } // attrs); makeWindowsImage = attrs: import ./win.nix ({ inherit pkgs; } // attrs);
layers = (import ./layers { inherit pkgs; }); layers = import ./layers { inherit pkgs; };
utils = (import ./utils.nix { inherit pkgs; }); utils = import ./utils.nix { inherit pkgs; };
} }

1
wfvm/utils.nix
View File

@ -4,6 +4,7 @@
, qemuMem ? "4G" , qemuMem ? "4G"
, efi ? true , efi ? true
, enableTpm ? false , enableTpm ? false
, ...
}: }:
rec { rec {

2
wfvm/win.nix
View File

@ -14,7 +14,7 @@
let let
lib = pkgs.lib; lib = pkgs.lib;
utils = import ./utils.nix { inherit pkgs efi enableTpm; }; utils = import ./utils.nix ({ inherit pkgs efi enableTpm; } // attrs);
inherit (pkgs) guestfs-tools; inherit (pkgs) guestfs-tools;
# p7zip on >20.03 has known vulns but we have no better option # p7zip on >20.03 has known vulns but we have no better option