nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-24 22:04:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "libaom,libvmaf: pin to GCC 13 on aarch64" (#344242)

Browse Source
This commit is contained in:
K900 2024-09-24 19:08:03 +03:00 committed by GitHub
commit a96bbfdd66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/top-level/all-packages.nix
View File

@ -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;