diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 47fc87af143b..3047cf539ceb 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 b1e43073a99a..e3ad3a1a3e0e 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 { };