treewide: clean up misc OVMF.fd references

We have passthru attributes, use them.

K900 a15aa7a3 bf5c44d0

+5 -6
+1 -1
pkgs/applications/virtualization/xen/4.15.nix
··· 125 ++ optional (withSeabios) "--with-system-seabios=${seabios}/share/seabios" 126 ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios" 127 128 - ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" 129 ++ optional (withInternalOVMF) "--enable-ovmf"; 130 131 NIX_CFLAGS_COMPILE = toString [
··· 125 ++ optional (withSeabios) "--with-system-seabios=${seabios}/share/seabios" 126 ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios" 127 128 + ++ optional (withOVMF) "--with-system-ovmf=${OVMF.firmware}" 129 ++ optional (withInternalOVMF) "--enable-ovmf"; 130 131 NIX_CFLAGS_COMPILE = toString [
+2 -2
pkgs/development/quickemu/default.nix
··· 61 62 postPatch = '' 63 sed -i \ 64 - -e '/OVMF_CODE_4M.secboot.fd/s|ovmfs=(|ovmfs=("${OVMFFull.fd}/FV/OVMF_CODE.fd","${OVMFFull.fd}/FV/OVMF_VARS.fd" |' \ 65 - -e '/OVMF_CODE_4M.fd/s|ovmfs=(|ovmfs=("${OVMF.fd}/FV/OVMF_CODE.fd","${OVMF.fd}/FV/OVMF_VARS.fd" |' \ 66 -e '/cp "''${VARS_IN}" "''${VARS_OUT}"/a chmod +w "''${VARS_OUT}"' \ 67 -e 's/Icon=.*qemu.svg/Icon=qemu/' \ 68 quickemu
··· 61 62 postPatch = '' 63 sed -i \ 64 + -e '/OVMF_CODE_4M.secboot.fd/s|ovmfs=(|ovmfs=("${OVMFFull.firmware}","${OVMFFull.variables}" |' \ 65 + -e '/OVMF_CODE_4M.fd/s|ovmfs=(|ovmfs=("${OVMF.firmware}","${OVMF.variables}" |' \ 66 -e '/cp "''${VARS_IN}" "''${VARS_OUT}"/a chmod +w "''${VARS_OUT}"' \ 67 -e 's/Icon=.*qemu.svg/Icon=qemu/' \ 68 quickemu
+2 -3
pkgs/tools/virtualization/multipass/default.nix
··· 70 71 # Patch the patch of the OVMF binaries to use paths from the nix store. 72 substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \ 73 - --replace "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \ 74 - --replace "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd" 75 76 # Copy the grpc submodule we fetched into the source code. 77 cp -r --no-preserve=mode ${grpc_src} 3rd-party/grpc ··· 122 dnsmasq 123 iproute2 124 iptables 125 - OVMF.fd 126 qemu 127 qemu-utils 128 xterm
··· 70 71 # Patch the patch of the OVMF binaries to use paths from the nix store. 72 substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \ 73 + --replace "OVMF.fd" "${OVMF.firmware}" \ 74 + --replace "QEMU_EFI.fd" "${OVMF.firmware}" 75 76 # Copy the grpc submodule we fetched into the source code. 77 cp -r --no-preserve=mode ${grpc_src} 3rd-party/grpc ··· 122 dnsmasq 123 iproute2 124 iptables 125 qemu 126 qemu-utils 127 xterm