diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2017-05-21 14:48:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-21 14:48:29 +0100 |
| commit | 07ceaa2ec8db636f1785ae244494dde6d5004287 (patch) | |
| tree | 302d51e9f10e9acc7a7298274c213fd6fe16cf84 /nixos/modules/virtualisation | |
| parent | 7aa70e138d86e37d5e400481d3fedbdc0447ec16 (diff) | |
| parent | 252dcd62f39ec9163832805dd41286c75f802530 (diff) | |
| download | nixlib-07ceaa2ec8db636f1785ae244494dde6d5004287.tar nixlib-07ceaa2ec8db636f1785ae244494dde6d5004287.tar.gz nixlib-07ceaa2ec8db636f1785ae244494dde6d5004287.tar.bz2 nixlib-07ceaa2ec8db636f1785ae244494dde6d5004287.tar.lz nixlib-07ceaa2ec8db636f1785ae244494dde6d5004287.tar.xz nixlib-07ceaa2ec8db636f1785ae244494dde6d5004287.tar.zst nixlib-07ceaa2ec8db636f1785ae244494dde6d5004287.zip | |
Merge pull request #25896 from joachifm/ovmf
ovmf: split firmware image files
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/libvirtd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 58581eed74a1..10a38b99f871 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -15,7 +15,7 @@ let ''; qemuConfigFile = pkgs.writeText "qemu.conf" '' ${optionalString cfg.qemuOvmf '' - nvram = ["${pkgs.OVMF}/FV/OVMF_CODE.fd:${pkgs.OVMF}/FV/OVMF_VARS.fd"] + nvram = ["${pkgs.OVMF.fd}/FV/OVMF_CODE.fd:${pkgs.OVMF.fd}/FV/OVMF_VARS.fd"] ''} ${cfg.qemuVerbatimConfig} ''; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index c75edfcd8cf6..a17e2c9ca471 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -126,7 +126,7 @@ let bootFlash=$out/bios.bin ${qemu}/bin/qemu-img create -f qcow2 $diskImage "40M" ${if cfg.useEFIBoot then '' - cp ${pkgs.OVMF-CSM}/FV/OVMF.fd $bootFlash + cp ${pkgs.OVMF-CSM.fd}/FV/OVMF.fd $bootFlash chmod 0644 $bootFlash '' else '' ''} |