From b1112b81c847fa45c793f6774f4382ee05ac7719 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 25 Dec 2023 12:02:30 +0000
Subject: [PATCH] nixVersions.nix_2_3: fix build against current gcc

Without the change `nix_2_3` fails the build due to it's dependency
pulling in newer `libstdc++`:

    $ nix build --no-link -f. nix_2_3
    error: builder for '/nix/store/d3vqya9ka7sh4m7q53xkjrv1rzbc0qa1-nix-2.3.17.drv' failed with exit code 2;
           last 10 log lines:
           > Note: Writing nix-instantiate.1
           > Note: Writing nix-prefetch-url.1
           > Note: Writing nix.conf.5
           >   LD     src/libstore/libnixstore.so
           >   LD     src/libmain/libnixmain.so
           >   LD     src/libexpr/libnixexpr.so
           >   LD     src/nix/nix
           > /nix/store/xdqs45iclhp9dz8zz9pvn5zivjbhid1a-binutils-2.40/bin/ld: /nix/store/i3qy2bskybxz53kbi9bbz5a3ysbm8asi-aws-sdk-cpp-1.9.294/lib/libaws-cpp-sdk-transfer.so: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32'
           > collect2: error: ld returned 1 exit status
           > make: *** [mk/lib.mk:122: src/nix/nix] Error 1
---
 pkgs/tools/package-management/nix/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b42487ac956a7..4652ddb76a5b4 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -8,7 +8,6 @@
 , fetchpatch2
 , runCommand
 , Security
-, pin-to-gcc12-if-gcc13
 
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
@@ -152,16 +151,14 @@ let
     pkg;
 
 in lib.makeExtensible (self: ({
-  nix_2_3 = pin-to-gcc12-if-gcc13 ((common {
+  nix_2_3 = (common {
     version = "2.3.17";
     hash = "sha256-EK0pgHDekJFqr0oMj+8ANIjq96WPjICe2s0m4xkUdH4=";
     patches = [
       patch-monitorfdhup
     ];
     maintainers = with lib.maintainers; [ flokli raitobezarius ];
-  }).override {
-    boehmgc = boehmgc-nix_2_3;
-  });
+  }).override { boehmgc = boehmgc-nix_2_3; };
 
   nix_2_10 = common {
     version = "2.10.3";