From 08ff5462edb94a01d3ba670ea1e90e794416dba3 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 16 Dec 2017 03:07:05 +0000 Subject: [PATCH] edk2 add short-circuit-the-transfer-of-an-empty-S3_CONTEXT.patch as requested by @lukeadams in https://github.com/NixOS/nixpkgs/pull/32724#issuecomment-352140119 --- pkgs/development/compilers/edk2/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 0024b4d27cd3..4b87beb08794 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libuuid, python2, iasl }: +{ stdenv, fetchFromGitHub, fetchpatch, libuuid, python2, iasl }: let pythonEnv = python2.withPackages(ps: [ps.tkinter]); @@ -20,7 +20,15 @@ edk2 = stdenv.mkDerivation { sha256 = "0k48xfwxcgcim1bhkggc19hilvsxsf5axvvcpmld0ng1fcfg0cr6"; }; - buildInputs = [ libuuid pythonEnv]; + patches = [ + (fetchpatch { + name = "short-circuit-the-transfer-of-an-empty-S3_CONTEXT.patch"; + url = "https://github.com/tianocore/edk2/commit/9e2a8e928995c3b1bb664b73fd59785055c6b5f6"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + }) + ]; + + buildInputs = [ libuuid pythonEnv ]; makeFlags = "-C BaseTools"; @@ -33,6 +41,8 @@ edk2 = stdenv.mkDerivation { mv -v edksetup.sh $out ''; + enableParallelBuilding = true; + meta = { description = "Intel EFI development kit"; homepage = https://sourceforge.net/projects/edk2/;