From 9f821fa0569c4b611812d3d4555958a24ce6dfb3 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 24 Aug 2024 16:52:04 +0200 Subject: [PATCH] ffmpeg: fix build on darwin when rubberband is enabled --- pkgs/development/libraries/ffmpeg/default.nix | 1 + pkgs/development/libraries/ffmpeg/generic.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 15785d24b6aa..cc468ec1c206 100644 --- 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 diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index ccd1642c6caa..4e8226c1904a 100644 --- 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 ]