Merge pull request #25896 from joachifm/ovmf

ovmf: split firmware image files
2017-05-21 14:48:29 +01:00
parent 7aa70e138d 252dcd62f3
commit 07ceaa2ec8
6 changed files with 15 additions and 6 deletions
@@ -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}
  '';
@@ -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 ''
              ''}