From afc91f5fefe5d159001238feb56c3267f65357c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 14 Sep 2021 19:49:09 +0200 Subject: [PATCH] graphite2: fixup build on aarch64-darwin after PR #123420 See the PR for discussion. This caused thousands of build regressions. --- pkgs/development/libraries/silgraphite/graphite2.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index f0ecab9d127..ea1bb493683 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ freetype ] - ++ lib.optionals (!stdenv.cc.isGNU) [ libgcc ]; + # On aarch64-darwin libgcc won't even build currently, and it doesn't seem needed. + ++ lib.optionals (with stdenv; !cc.isGNU && !(isDarwin && isAarch64)) [ libgcc ]; patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ];