From edf6343562450eec0a212d10d96fb9e39192933f Mon Sep 17 00:00:00 2001
From: marco <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Sun, 2 Aug 2026 12:16:49 +0200
Subject: [PATCH] ci: Compile with minimum supported g++-11 in olddeps

---
 ci/configs/olddeps.bash | 2 +-
 shell.nix               | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ci/configs/olddeps.bash b/ci/configs/olddeps.bash
index 1a363b1b..a82c5eae 100644
--- a/ci/configs/olddeps.bash
+++ b/ci/configs/olddeps.bash
@@ -1,5 +1,5 @@
 CI_DESC="CI job using old Cap'n Proto and cmake versions"
 CI_DIR=build-olddeps
 export CXXFLAGS="-Werror -Wall -Wextra -Wpedantic -Wno-unused-parameter -Wno-error=array-bounds"
-NIX_ARGS=(--argstr capnprotoVersion "0.9.2" --argstr cmakeVersion "3.12.4")
+NIX_ARGS=(--argstr capnprotoVersion "0.9.2" --argstr cmakeVersion "3.12.4" --argstr gccVersion "11")
 BUILD_ARGS=(-k)
diff --git a/shell.nix b/shell.nix
index 1a4614e3..064c8847 100644
--- a/shell.nix
+++ b/shell.nix
@@ -5,6 +5,7 @@
 , capnprotoVersion ? null
 , capnprotoSanitizers ? null # Optional sanitizers to build cap'n proto with
 , cmakeVersion ? null
+, gccVersion ? null
 , libcxxSanitizers ? null # Optional LLVM_USE_SANITIZER value to use for libc++, see https://llvm.org/docs/CMake.html
 }:
 
@@ -59,6 +60,7 @@ let
   cmakeHashes = {
     "3.12.4" = "sha256-UlVYS/0EPrcXViz/iULUcvHA5GecSUHYS6raqbKOMZQ=";
   };
+  gcc = if gccVersion == null then null else builtins.getAttr ("gcc" + gccVersion) pkgs;
   cmakeBuild = if cmakeVersion == null then pkgs.cmake else (pkgs.cmake.overrideAttrs (old: {
     version = cmakeVersion;
     src = pkgs.fetchurl {
@@ -75,11 +77,14 @@ in crossPkgs.mkShell {
     cmakeBuild
     include-what-you-use
     ninja
-  ] ++ lib.optionals (!minimal) [
+  ] ++ lib.optional (gcc != null) gcc ++ lib.optionals (!minimal) [
     clang
     clang-tools
   ];
 
+  CC = if gcc == null then null else "${gcc}/bin/gcc";
+  CXX = if gcc == null then null else "${gcc}/bin/g++";
+
   # Tell IWYU where its libc++ mapping lives
   IWYU_MAPPING_FILE = if enableLibcxx then "${llvm.libcxx.dev}/include/c++/v1/libcxx.imp" else null;
 }