diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-23 18:02:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-23 18:02:19 +0000 |
| commit | f4c71b2f8c1083a7addc4faf02696dc723e9645a (patch) | |
| tree | 6f9c239c01267049ce95832f5153da4f6d400ac8 /pkgs/development/libraries/ffmpeg/generic.nix | |
| parent | 6c1953b24f46bddfc18637834a27fbed55428639 (diff) | |
| parent | dea59d38738f9a93b2a8418fcbc4196e1aee58f4 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/ffmpeg/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 709a5f3e07345..5d9b41848cae3 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { ++ optional libmfxSupport intel-media-sdk ++ optional libaomSupport libaom ++ optional vpxSupport libvpx - ++ optionals (!stdenv.isDarwin && !stdenv.isAarch32 && pulseaudioSupport) [ libpulseaudio ] # Need to be fixed on Darwin and ARM + ++ optionals (!stdenv.isDarwin && pulseaudioSupport) [ libpulseaudio ] # Need to be fixed on Darwin ++ optionals vaapiSupport [ libva libdrm ] ++ optional stdenv.isLinux alsa-lib ++ optionals stdenv.isDarwin [ Cocoa CoreMedia VideoToolbox ] |