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

Compare commits

base: M-Labs:7e09796a9b1a52c80418518b09e7f6399cd88f46
Branches Tags
M-Labs:master
...
compare: M-Labs:8051ad647af9880e0ff5efd5f0bd2f5e55fa1883
Branches Tags
M-Labs:master

2 Commits
7e09796a9b ... 8051ad647a

Author SHA1 Message Date
Astro 8051ad647a utils.nix: pass all attrs 
Fixes passing baseRtc and other parameters
 2023-06-26 15:48:34 +02:00
Astro ec1c08956b default.nix: remove superfluous parentheses 2023-06-26 15:48:18 +02:00
3 changed files with 4 additions and 3 deletions
Show Stats 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