From 4688d3efc8a9368328ee6015b3430852e2f29a33 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <julian.stecklina@cyberus-technology.de>
Date: Wed, 17 Aug 2022 09:42:14 +0200
Subject: [PATCH 1/2] coreboot: fix buildgcc patching

This seems to have been a copy'n'paste mistake. `$out` doesn't exist
at this point.
---
 pkgs/development/tools/misc/coreboot-toolchain/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix
index 7e3604c3511a..3452ac6ef963 100644
--- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix
+++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix
@@ -40,7 +40,7 @@ let
       dontInstall = true;
 
       postPatch = ''
-        patchShebangs $out/util/crossgcc/buildgcc
+        patchShebangs util/crossgcc/buildgcc
 
         mkdir -p util/crossgcc/tarballs
 

From 0854793542884ea1d266afe4e684624dbc16f9d7 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <julian.stecklina@cyberus-technology.de>
Date: Wed, 17 Aug 2022 09:46:01 +0200
Subject: [PATCH 2/2] coreboot: make Ada support optional

Ada support keeps breaking due to gnat being in a somewhat poor state
in nixpkgs. As Ada support is only necessary for some Intel drivers
and these are generally not required for using coreboot in a VM, make
Ada support optional.
---
 pkgs/development/tools/misc/coreboot-toolchain/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix
index 3452ac6ef963..0229aba0f38b 100644
--- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix
+++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix
@@ -9,10 +9,12 @@ let
     , getopt
     , git
     , gnat11
+    , gcc
     , lib
     , perl
     , stdenvNoCC
     , zlib
+    , withAda ? true
     }:
 
     stdenvNoCC.mkDerivation rec {
@@ -33,7 +35,7 @@ let
       };
 
       nativeBuildInputs = [ bison curl git perl ];
-      buildInputs = [ flex gnat11 zlib ];
+      buildInputs = [ flex zlib (if withAda then gnat11 else gcc) ];
 
       enableParallelBuilding = true;
       dontConfigure = true;