lol

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

+11 -9
-5
flake.nix
··· 45 45 system.nixos.versionSuffix = 46 46 ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; 47 47 system.nixos.revision = final.mkIf (self ? rev) self.rev; 48 - 49 - system.build = { 50 - vm = lib.mkDefault config.virtualisation.vmVariant.system.build.vm; 51 - vmWithBootLoader = lib.mkDefault config.virtualisation.vmVariantWithBootLoader.system.build.vm; 52 - }; 53 48 }) 54 49 ]; 55 50 });
+1 -3
nixos/default.nix
··· 16 16 17 17 system = eval.config.system.build.toplevel; 18 18 19 - vm = eval.config.virtualisation.vmVariant.system.build.vm; 20 - 21 - vmWithBootLoader = eval.config.virtualisation.vmVariantWithBootLoader.system.build.vm; 19 + inherit (eval.config.system.build) vm vmWithBootLoader; 22 20 }
+10 -1
nixos/modules/virtualisation/build-vm.nix
··· 1 - { extendModules, lib, ... }: 1 + { config, extendModules, lib, ... }: 2 2 let 3 3 4 4 inherit (lib) ··· 40 40 inherit (vmVariantWithBootLoader) type; 41 41 default = {}; 42 42 visible = "shallow"; 43 + }; 44 + 45 + }; 46 + 47 + config = { 48 + 49 + system.build = { 50 + vm = lib.mkDefault config.virtualisation.vmVariant.system.build.vm; 51 + vmWithBootLoader = lib.mkDefault config.virtualisation.vmVariantWithBootLoader.system.build.vm; 43 52 }; 44 53 45 54 };