diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-09-14 19:49:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-09-14 19:50:55 +0200 |
| commit | afc91f5fefe5d159001238feb56c3267f65357c5 (patch) | |
| tree | f01d56949b13d7a034b7412e6219b4ac6aa825bf | |
| parent | 92042a285e45c40936a3813b95f2e1079a51ecf9 (diff) | |
| download | nixpkgs-afc91f5fefe5d159001238feb56c3267f65357c5.tar nixpkgs-afc91f5fefe5d159001238feb56c3267f65357c5.tar.gz nixpkgs-afc91f5fefe5d159001238feb56c3267f65357c5.tar.bz2 nixpkgs-afc91f5fefe5d159001238feb56c3267f65357c5.tar.lz nixpkgs-afc91f5fefe5d159001238feb56c3267f65357c5.tar.xz nixpkgs-afc91f5fefe5d159001238feb56c3267f65357c5.tar.zst nixpkgs-afc91f5fefe5d159001238feb56c3267f65357c5.zip | |
graphite2: fixup build on aarch64-darwin after PR #123420
See the PR for discussion. This caused thousands of build regressions.
| -rw-r--r-- | pkgs/development/libraries/silgraphite/graphite2.nix | 3 |
1 files changed, 2 insertions, 1 deletions
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 ]; |