Unverified Commit b2f19129 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #197344 from misuzu/ffmpeg-armv7l

parents d0e29ed8 ba7f093c

pkgs/development/libraries/ffmpeg/generic.nix

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,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 ]