diff --git a/nixos-modules/default.nix b/nixos-modules/default.nix index 29d805b..ac0527e 100644 --- a/nixos-modules/default.nix +++ b/nixos-modules/default.nix @@ -19,7 +19,7 @@ let guestChildren = lib'.runDhallCommand "vbox.dhall" { } ('' dhall > $out << END - let Genode = env:GENODE_DHALL + let Genode = env:DHALL_GENODE let toVbox = ${./dhall/vbox-guest.dhall} in [ '' + builtins.concatStringsSep "," (lib.mapAttrsToList (vmName: cfg: @@ -28,11 +28,11 @@ let vdiFile = "${toVdi config}/nixos.vdi"; in '' { mapKey = "vbox-${vmName}" - , mapValule = + , mapValue = toVbox { vdiFilename = "${vdiFile}" , vdiUuid = - "\$(${pkgs.virtualbox}/bin/VBoxManage showmediuminfo ${vdiFile} | awk '/^UUID:/ {print \$2}')" + "$(${pkgs.virtualbox}/bin/VBoxManage showmediuminfo ${vdiFile} | awk '/^UUID:/ {print \$2}')" , memorySize = ${toString config.virtualbox.memorySize} , vmName = "${vmName}" } diff --git a/nixos-modules/dhall/vbox-host.dhall b/nixos-modules/dhall/vbox-host.dhall index 617e37f..d6f671c 100644 --- a/nixos-modules/dhall/vbox-host.dhall +++ b/nixos-modules/dhall/vbox-host.dhall @@ -491,7 +491,8 @@ let rootInit = (Some "nic_drv") ] } - , guests = toChild Init::{ children = guests } Init.Attributes::{=} + , guests = + Init.toChild Init::{ children = guests } Init.Attributes::{=} } }