From 20f138c3d7fb30340092e0569796b2b68840d9ac Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 13 Dec 2016 22:37:06 +0100 Subject: [PATCH] ffmpeg: respect sdlSupport option --- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index f6c40fa5dd0..0ac82f98a24 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora - libvdpau libvorbis lzma SDL soxr x264 x265 xvidcore zlib libopus + libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus ] ++ optional openglSupport mesa ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isArm) libva