Skip to content

Commit c11091c

Browse files
authored
libaom,libvmaf: pin to GCC 13 on aarch64 (#342306)
2 parents 3e31701 + adb8dff commit c11091c

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

pkgs/top-level/all-packages.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20968,7 +20968,10 @@ with pkgs;
2096820968

2096920969
libantlr3c = callPackage ../development/libraries/libantlr3c { };
2097020970

20971-
libaom = callPackage ../development/libraries/libaom { };
20971+
libaom = callPackage ../development/libraries/libaom {
20972+
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116737
20973+
stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv;
20974+
};
2097220975

2097320976
libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
2097420977
libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
@@ -22186,7 +22189,10 @@ with pkgs;
2218622189

2218722190
libvisual = callPackage ../development/libraries/libvisual { };
2218822191

22189-
libvmaf = callPackage ../development/libraries/libvmaf { };
22192+
libvmaf = callPackage ../development/libraries/libvmaf {
22193+
# See libaom
22194+
stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv;
22195+
};
2219022196

2219122197
libvncserver = callPackage ../development/libraries/libvncserver {
2219222198
inherit (darwin.apple_sdk.frameworks) Carbon;

0 commit comments

Comments
 (0)