From 3cbc5144cce6e783216f441d472050525d88ded8 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 4 Mar 2023 00:26:18 +0200
Subject: [PATCH] bobcat: remove -lgcc from NIX_LDFLAGS

---
 pkgs/development/libraries/bobcat/default.nix | 4 ----
 pkgs/top-level/all-packages.nix               | 6 +-----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 47fc87af143..3047cf539ce 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  # have to link to static gcc lib on aarch64-linux explicitly
-  # https://github.com/NixOS/nixpkgs/issues/201254
-  NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc";
-
   buildPhase = ''
     ./build libraries all
     ./build man
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1e43073a99..e3ad3a1a3e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19255,11 +19255,7 @@ with pkgs;
     else callPackage ../os-specific/linux/bionic-prebuilt { };
 
 
-  bobcat = callPackage ../development/libraries/bobcat {
-    # C++20 is required, aarch64-linux has gcc 9 by default
-    # https://github.com/NixOS/nixpkgs/issues/201254
-    stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv;
-  };
+  bobcat = callPackage ../development/libraries/bobcat { };
 
   boehmgc = callPackage ../development/libraries/boehm-gc { };