From 74dce901aae2dd82d6ce69fb85b88ea884795200 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Thu, 17 Aug 2023 02:31:07 -0700
Subject: [PATCH] gcc: update gccFun for deduplicated gcc expressions

---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6369025bfd54..4ec129f540c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15669,7 +15669,7 @@ with pkgs;
     else 12;
   inherit ({
       gcc = pkgs.${"gcc${toString default-gcc-version}"};
-      gccFun = callPackage (../development/compilers/gcc + "/${toString default-gcc-version}");
+      gccFun = callPackage ../development/compilers/gcc;
     }) gcc gccFun;
   gcc-unwrapped = gcc.cc;
 
@@ -15770,6 +15770,7 @@ with pkgs;
       cc = gccFun {
         # copy-pasted
         inherit noSysDirs;
+        majorMinorVersion = toString default-gcc-version;
 
         reproducibleBuild = true;
         profiledCompiler = false;