diff options
| author | Shea Levy <shea@shealevy.com> | 2024-02-26 07:55:55 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2024-02-26 07:55:55 -0500 |
| commit | 6edee624d05dc5b6fe938f35b90ff1359e047107 (patch) | |
| tree | 8b7e8510830aadfc55362033f5d1be56bb62d7b8 | |
| parent | 3cfe62d85a2d1ab76a432ba5a2a192d00584e658 (diff) | |
| download | nixlib-6edee624d05dc5b6fe938f35b90ff1359e047107.tar nixlib-6edee624d05dc5b6fe938f35b90ff1359e047107.tar.gz nixlib-6edee624d05dc5b6fe938f35b90ff1359e047107.tar.bz2 nixlib-6edee624d05dc5b6fe938f35b90ff1359e047107.tar.lz nixlib-6edee624d05dc5b6fe938f35b90ff1359e047107.tar.xz nixlib-6edee624d05dc5b6fe938f35b90ff1359e047107.tar.zst nixlib-6edee624d05dc5b6fe938f35b90ff1359e047107.zip | |
OVMF: Restore installation of OVMF.fd.
I accidentally removed this in f6fc51d (I missed the leading comma on line 160), which was merged as part of #284874 This should be removed eventually, but it should be done intentionally with proper release notes.
| -rw-r--r-- | pkgs/applications/virtualization/OVMF/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index cff31a759a2b..d3ebd6a7f29e 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -154,9 +154,14 @@ edk2.mkDerivation projectDscPath (finalAttrs: { ) ''; + # TODO: Usage of -bios OVMF.fd is discouraged: https://lists.katacontainers.io/pipermail/kata-dev/2021-January/001650.html + # We should remove the isx86-specifc block here once we're ready to update nixpkgs to stop using that and update the + # release notes accordingly. postInstall = '' mkdir -vp $fd/FV mv -v $out/FV/${fwPrefix}_{CODE,VARS}.fd $fd/FV + '' + lib.optionalString stdenv.hostPlatform.isx86 '' + mv -v $out/FV/${fwPrefix}.fd $fd/FV '' + lib.optionalString msVarsTemplate '' mv -v $out/FV/${fwPrefix}_VARS.ms.fd $fd/FV ln -sv $fd/FV/${fwPrefix}_CODE{,.ms}.fd |