From d87956c5048084c544327a77fd295a8174dba23a Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Thu, 26 Mar 2026 00:37:24 +0100 Subject: [PATCH] Add NixOS specific qemu UEFI firmware searchpaths --- mk/qemu.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mk/qemu.mk b/mk/qemu.mk index e9dc2376d..0b3aee4d3 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -39,6 +39,7 @@ else ifeq ($(ARCH),x86_64) ifeq ($(FIRMWARE),) PFLASH0=$(firstword \ $(wildcard /usr/share/qemu/edk2-x86_64-code.fd) \ + $(wildcard /run/libvirt/nix-ovmf/edk2-x86_64-code.fd) \ $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2s-x86_64-code.fd) \ ) endif @@ -77,6 +78,7 @@ else ifeq ($(ARCH),aarch64) ifeq ($(FIRMWARE),) PFLASH0=$(firstword \ $(wildcard /usr/share/qemu/edk2-aarch64-code.fd) \ + $(wildcard /run/libvirt/nix-ovmf/edk2-aarch64-code.fd) \ $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-aarch64-code.fd) \ ) endif @@ -110,12 +112,14 @@ else ifeq ($(ARCH),riscv64gc) $(wildcard /usr/share/qemu-efi-riscv64/RISCV_VIRT_CODE.fd) \ $(wildcard /usr/share/edk2/riscv/RISCV_VIRT_CODE.fd) \ $(wildcard /usr/share/qemu/edk2-riscv-code.fd) \ + $(wildcard /run/libvirt/nix-ovmf/edk2-riscv-code.fd) \ $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-riscv-code.fd) \ ) PFLASH1=$(firstword \ $(wildcard /usr/share/qemu-efi-riscv64/RISCV_VIRT_VARS.fd) \ $(wildcard /usr/share/edk2/riscv/RISCV_VIRT_VARS.fd) \ $(wildcard /usr/share/qemu/edk2-riscv-vars.fd) \ + $(wildcard /run/libvirt/nix-ovmf/edk2-riscv-vars.fd) \ $(wildcard /opt/homebrew/opt/qemu/share/qemu/edk2-riscv-vars.fd) \ ) ifneq ($(usb),no)