From 42cba719c818f1303af398d93985ff3794f2ae7e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 28 Feb 2023 10:12:50 +0200 Subject: [PATCH] bobcat: use gcc12Stdenv on aarch64-linux --- pkgs/top-level/all-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebc8418f09b2..e48479f8a5cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19150,11 +19150,11 @@ with pkgs; else callPackage ../os-specific/linux/bionic-prebuilt { }; - bobcat = callPackage ../development/libraries/bobcat - (lib.optionalAttrs (with stdenv.hostPlatform; isAarch64 && isLinux) { - # C++20 is required, aarch64-linux has gcc 9 by default - stdenv = gcc10Stdenv; - }); + 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; + }; boehmgc = callPackage ../development/libraries/boehm-gc { };