diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-09-05 15:17:01 +0000 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-05 17:17:01 +0200 |
| commit | 6abd75067ab70a33bb49f2ea6f141967af79a61d (patch) | |
| tree | 72588de0a5d7dc3cb6baa0b773b2d7b97df7ccf9 /pkgs/development/libraries | |
| parent | 7fac51740a151a7b78c5fbe225b7ef49933825e5 (diff) | |
| download | nixlib-6abd75067ab70a33bb49f2ea6f141967af79a61d.tar nixlib-6abd75067ab70a33bb49f2ea6f141967af79a61d.tar.gz nixlib-6abd75067ab70a33bb49f2ea6f141967af79a61d.tar.bz2 nixlib-6abd75067ab70a33bb49f2ea6f141967af79a61d.tar.lz nixlib-6abd75067ab70a33bb49f2ea6f141967af79a61d.tar.xz nixlib-6abd75067ab70a33bb49f2ea6f141967af79a61d.tar.zst nixlib-6abd75067ab70a33bb49f2ea6f141967af79a61d.zip | |
ffmpeg: add support for libssh and speex (#46078)
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 7d72de2a2ded..89e06f8b8d92 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, libvorbis, libvpx, lzma, libpulseaudio, soxr -, x264, x265, xvidcore, zlib, libopus +, libssh, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr +, x264, x265, xvidcore, zlib, libopus, speex , openglSupport ? false, libGLU_combined ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { "--enable-libmp3lame" (ifMinVer "1.2" "--enable-iconv") "--enable-libtheora" + "--enable-libssh" (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi")) "--enable-vdpau" "--enable-libvorbis" @@ -141,6 +142,7 @@ stdenv.mkDerivation rec { "--enable-libxvid" "--enable-zlib" (ifMinVer "2.8" "--enable-libopus") + "--enable-libspeex" (ifMinVer "2.8" "--enable-libx265") # Developer flags (enableFeature debugDeveloper "debug") @@ -157,8 +159,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; buildInputs = [ - bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora - libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus + bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora + libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex ] ++ optional openglSupport libGLU_combined ++ optional vpxSupport libvpx ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM |