From e480154f61b12abb27f057b21db9f87becbf6e61 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 24 Sep 2024 18:05:12 +0200 Subject: [PATCH] Revert "libaom,libvmaf: pin to GCC 13 on aarch64" This reverts commit adb8dffe97f307fba886b8ec35d09b2e438b09c7. The default GCC has been reverted to 13. We won't be upgrading to 14 until after the next minor release comes out, which will include the fix for the issue being worked around here. --- pkgs/top-level/all-packages.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26b089ea720d..443379cf3594 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20752,10 +20752,7 @@ with pkgs; libantlr3c = callPackage ../development/libraries/libantlr3c { }; - libaom = callPackage ../development/libraries/libaom { - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116737 - stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv; - }; + libaom = callPackage ../development/libraries/libaom { }; libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; }; libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; @@ -21948,10 +21945,7 @@ with pkgs; libvisual = callPackage ../development/libraries/libvisual { }; - libvmaf = callPackage ../development/libraries/libvmaf { - # See libaom - stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv; - }; + libvmaf = callPackage ../development/libraries/libvmaf { }; libvncserver = callPackage ../development/libraries/libvncserver { inherit (darwin.apple_sdk.frameworks) Carbon;