From e781a8257b4312f6b138c7d0511c77d8c06ed819 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 26 Mar 2016 17:01:22 +0300 Subject: [PATCH] ffmpeg: add libopus support --- pkgs/development/libraries/ffmpeg/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 1113db5c136..52273857fe9 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libtheora, libva, libvdpau, libvorbis, libvpx, lzma, libpulseaudio, SDL, soxr -, x264, xvidcore, zlib +, x264, xvidcore, zlib, libopus , openglSupport ? false, mesa ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -126,6 +126,7 @@ stdenv.mkDerivation rec { "--enable-libx264" "--enable-libxvid" "--enable-zlib" + (ifMinVer "2.8" "--enable-libopus") # Developer flags (enableFeature debugDeveloper "debug") (enableFeature optimizationsDeveloper "optimizations") @@ -139,7 +140,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora - libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib + libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib libopus ] ++ optional openglSupport mesa ++ optionals (!isDarwin) [ libvpx libpulseaudio ] # Need to be fixed on Darwin ++ optional (isLinux || isFreeBSD) libva