From 131a97e8c8790621fde729335339668463a4604f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 22 Jun 2022 23:08:05 +0100 Subject: [PATCH] gnu-efi: pull fix pending upstream inclusion for parallel build failures Without the change parallel build fails as: gcc -I/build/gnu-efi-code//lib ... -c lib/runtime/rtstr.c -o runtime/rtstr.o Assembler messages: Fatal error: can't create runtime/rtstr.o: No such file or directory --- pkgs/development/libraries/gnu-efi/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index f331a8f753b..a49e0fad215 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { sha256 = "tztkOg1Wl9HzltdDFEjoht2AVmh4lXjj4aKCd8lShDU="; }; + patches = [ + # Pull fix pending upstream inclusion for parallel builds + # https://sourceforge.net/p/gnu-efi/patches/84/ + (fetchurl { + name = "parallel-build.patch"; + url = "https://sourceforge.net/p/gnu-efi/patches/84/attachment/0001-lib-Makefile-add-.o-file-dependency-on-libsubdirs-ta.patch"; + sha256 = "sha256-+2UwV2lopdB/tazib1BLzO1E3GgB1L8dZsSQKWVoLwA="; + }) + ]; + buildInputs = [ pciutils ]; hardeningDisable = [ "stackprotector" ];