From 801152e05766f61990f9a5b375fe61bbf1ed43a6 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 22 Jul 2021 14:51:39 +0200
Subject: [PATCH] gnat*: take bootstrap gnat compiler from buildPackages

Due to overriding and use in string interpolation, our splicing magic
doesn't work and we need to do this explicitly.
---
 pkgs/top-level/all-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c81ca8b0a2e8..7dc2993f453d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11212,7 +11212,7 @@ in
     langCC = false;
     langAda = true;
     profiledCompiler = false;
-    inherit gnatboot;
+    inherit (buildPackages) gnatboot;
   });
 
   gnat9 = wrapCC (gcc9.cc.override {
@@ -11221,7 +11221,7 @@ in
     langCC = false;
     langAda = true;
     profiledCompiler = false;
-    gnatboot = gnat6;
+    gnatboot = buildPackages.gnat6;
   });
 
   gnat10 = wrapCC (gcc10.cc.override {
@@ -11230,7 +11230,7 @@ in
     langCC = false;
     langAda = true;
     profiledCompiler = false;
-    gnatboot = gnat6;
+    gnatboot = buildPackages.gnat6;
   });
 
   gnat11 = wrapCC (gcc11.cc.override {
@@ -11239,7 +11239,7 @@ in
     langCC = false;
     langAda = true;
     profiledCompiler = false;
-    gnatboot = gnat6;
+    gnatboot = buildPackages.gnat6;
   });
 
   gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { });