From 0aa21a70530618bfdd18c532b4af0c290ad7d070 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 6 Nov 2022 19:53:25 -0500 Subject: [PATCH] edk2-uefi-shell: fix build on x86_64-darwin ZHF #199919 --- pkgs/tools/misc/edk2-uefi-shell/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/edk2-uefi-shell/default.nix b/pkgs/tools/misc/edk2-uefi-shell/default.nix index 78e0ba28afb078c..e3d73775021f2ce 100644 --- a/pkgs/tools/misc/edk2-uefi-shell/default.nix +++ b/pkgs/tools/misc/edk2-uefi-shell/default.nix @@ -1,5 +1,7 @@ { lib +, stdenv , edk2 +, llvmPackages , util-linux , nasm , python3 @@ -8,9 +10,12 @@ edk2.mkDerivation "ShellPkg/ShellPkg.dsc" (finalAttrs: { pname = "edk2-uefi-shell"; inherit (edk2) version; - nativeBuildInputs = [ util-linux nasm python3 ]; + nativeBuildInputs = [ util-linux nasm python3 ] + ++ lib.optionals stdenv.cc.isClang [ llvmPackages.bintools llvmPackages.llvm ]; strictDeps = true; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-fno-pic" "-Qunused-arguments" ]; + # We only have a .efi file in $out which shouldn't be patched or stripped dontPatchELF = true; dontStrip = true;