From cb29bc6ace2c037a70facbea481f46704b37022d Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 19 Jul 2023 22:56:18 +0300
Subject: [PATCH 1/2] stdenvAdapters: Fix condition

Fixes issue 244232
---
 pkgs/stdenv/adapters.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 22da13f5d1eb8..50cb11dade5f8 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -67,7 +67,7 @@ rec {
             "--disable-shared" # brrr...
           ];
       }));
-    } // lib.optionalAttrs (stdenv0.hostPlatform.libc == "libc") {
+    } // lib.optionalAttrs (stdenv0.hostPlatform.libc == "glibc") {
       extraBuildInputs = (old.extraBuildInputs or []) ++ [
         pkgs.glibc.static
       ];

From 29b4a92458d2b3c872b6aac6d6ea9f585dc98b38 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 19 Jul 2023 23:01:11 +0300
Subject: [PATCH 2/2] stdenvAdapters: Remove 6 year old comment

Comment was added in 3c36dcc and hasn't been needed because makeStaticBinaries already adds glibc.static
---
 pkgs/stdenv/adapters.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 50cb11dade5f8..f29bdf671c8c6 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -121,9 +121,6 @@ rec {
     # Apple does not provide a static version of libSystem or crt0.o
     # So we can’t build static binaries without extensive hacks.
     ++ lib.optional (!stdenv.hostPlatform.isDarwin) makeStaticBinaries
-
-    # Glibc doesn’t come with static runtimes by default.
-    # ++ lib.optional (stdenv.hostPlatform.libc == "glibc") ((lib.flip overrideInStdenv) [ self.glibc.static ])
   );