Merge pull request #337028 from jopejoe1/ffmpeg-darwin-fixes

ffmpeg-full: fix build on darwin in staging-next
2024-08-24 16:53:37 +01:00 · 2024-08-24 16:53:37 +01:00 · 2470d968fb
commit 2470d968fb
parent 64dfaf32be 9f821fa056
2 changed files with 3 additions and 1 deletions
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@ -6,6 +6,7 @@ let
    callPackage ./generic.nix (
      {
        inherit (darwin.apple_sdk.frameworks)
+          Accelerate
          AppKit
          AudioToolbox
          AVFoundation
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@ -328,6 +328,7 @@
 /*
 *  Darwin frameworks
 */
+, Accelerate
 , AppKit
 , AudioToolbox
 , AVFoundation
@ -778,7 +779,7 @@ stdenv.mkDerivation (finalAttrs: {
  ++ optionals withQuirc [ quirc ]
  ++ optionals withRav1e [ rav1e ]
  ++ optionals withRtmp [ rtmpdump ]
-  ++ optionals withRubberband [ rubberband ]
+  ++ optionals withRubberband ([ rubberband ] ++ lib.optional stdenv.hostPlatform.isDarwin Accelerate)
  ++ optionals withSamba [ samba ]
  ++ optionals withSdl2 [ SDL2 ]
  ++ optionals withShaderc [ shaderc ]