diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2021-12-17 14:34:30 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2021-12-17 14:49:31 +0100 |
| commit | 6510ec5acdd465a016e5671ffa99460ef70e6c25 (patch) | |
| tree | a5df9efe3c9841e281d047f92f75caf2d0fd8aa5 /nixos | |
| parent | 4014fb6a64bc5f68326fc08cbaa83475db1fae8e (diff) | |
| download | nixpkgs-6510ec5acdd465a016e5671ffa99460ef70e6c25.tar nixpkgs-6510ec5acdd465a016e5671ffa99460ef70e6c25.tar.gz nixpkgs-6510ec5acdd465a016e5671ffa99460ef70e6c25.tar.bz2 nixpkgs-6510ec5acdd465a016e5671ffa99460ef70e6c25.tar.lz nixpkgs-6510ec5acdd465a016e5671ffa99460ef70e6c25.tar.xz nixpkgs-6510ec5acdd465a016e5671ffa99460ef70e6c25.tar.zst nixpkgs-6510ec5acdd465a016e5671ffa99460ef70e6c25.zip | |
nixos: Make system.build.vm a standard attribute based on vmVariant
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/default.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/build-vm.nix | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/nixos/default.nix b/nixos/default.nix index 27a0fd73ecd..6beb4cd3a7d 100644 --- a/nixos/default.nix +++ b/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; } diff --git a/nixos/modules/virtualisation/build-vm.nix b/nixos/modules/virtualisation/build-vm.nix index d856b1b502b..3baa84cce01 100644 --- a/nixos/modules/virtualisation/build-vm.nix +++ b/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; + }; + + }; } |