From 8f49652bea9b063eda203d41664c993fabb78d0a Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Wed, 2 Oct 2024 20:44:11 +0200 Subject: [PATCH] edk2: use openssl 3.0 for now Signed-off-by: Markus Theil Picked from PR https://github.com/NixOS/nixpkgs/pull/345998 In particular, this fixes OVMF build (a channel blocker). https://hydra.nixos.org/build/274346247/nixlog/1/tail --- pkgs/by-name/ed/edk2/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index b4919f27efb0..e986e42bd47a 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -63,16 +63,18 @@ edk2 = stdenv.mkDerivation { }) ]; + # EDK2 is currently working on OpenSSL 3.3.x support. Use buildpackages.openssl again, + # when "https://github.com/tianocore/edk2/pull/6167" is merged. postPatch = '' # We don't want EDK2 to keep track of OpenSSL, they're frankly bad at it. rm -r CryptoPkg/Library/OpensslLib/openssl mkdir -p CryptoPkg/Library/OpensslLib/openssl ( cd CryptoPkg/Library/OpensslLib/openssl - tar --strip-components=1 -xf ${buildPackages.openssl.src} + tar --strip-components=1 -xf ${buildPackages.openssl_3.src} # Apply OpenSSL patches. - ${lib.pipe buildPackages.openssl.patches [ + ${lib.pipe buildPackages.openssl_3.patches [ (builtins.filter ( patch: !builtins.elem (baseNameOf patch) [