nixos: Make system.build.vm a standard attribute based on vmVariant

Author: roberth

flake.nix

@@ -45,11 +45,6 @@
                   system.nixos.versionSuffix =
                     ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
                   system.nixos.revision = final.mkIf (self ? rev) self.rev;
-
-                  system.build = {
-                    vm = lib.mkDefault config.virtualisation.vmVariant.system.build.vm;
-                    vmWithBootLoader = lib.mkDefault config.virtualisation.vmVariantWithBootLoader.system.build.vm;
-                  };
                 })
               ];
           });

nixos/default.nix

@@ -16,7 +16,5 @@ in
 
   system = eval.config.system.build.toplevel;
 
-  vm = eval.config.virtualisation.vmVariant.system.build.vm;
-
-  vmWithBootLoader = eval.config.virtualisation.vmVariantWithBootLoader.system.build.vm;
+  inherit (eval.config.system.build) vm vmWithBootLoader;
 }

nixos/modules/virtualisation/build-vm.nix

@@ -1,4 +1,4 @@
-{ extendModules, lib, ... }:
+{ config, extendModules, lib, ... }:
 let
 
   inherit (lib)
@@ -43,4 +43,13 @@ in
     };
 
   };
+
+  config = {
+
+    system.build = {
+      vm = lib.mkDefault config.virtualisation.vmVariant.system.build.vm;
+      vmWithBootLoader = lib.mkDefault config.virtualisation.vmVariantWithBootLoader.system.build.vm;
+    };
+
+  };
 }