diff options
| author | codyopel <codyopel@gmail.com> | 2015-05-28 07:39:10 -0400 |
|---|---|---|
| committer | codyopel <codyopel@gmail.com> | 2015-05-28 07:39:10 -0400 |
| commit | ec8babb4fd754eb64d538b8a1a3020b970fe63d5 (patch) | |
| tree | 4501e9b35a317c8e9d309ec9b26d8f5f6fe6d98e /pkgs/development/libraries/ffmpeg | |
| parent | cb02d37c31b83cf9f17ded6c4893a711713ccce8 (diff) | |
| download | nixpkgs-ec8babb4fd754eb64d538b8a1a3020b970fe63d5.tar nixpkgs-ec8babb4fd754eb64d538b8a1a3020b970fe63d5.tar.gz nixpkgs-ec8babb4fd754eb64d538b8a1a3020b970fe63d5.tar.bz2 nixpkgs-ec8babb4fd754eb64d538b8a1a3020b970fe63d5.tar.lz nixpkgs-ec8babb4fd754eb64d538b8a1a3020b970fe63d5.tar.xz nixpkgs-ec8babb4fd754eb64d538b8a1a3020b970fe63d5.tar.zst nixpkgs-ec8babb4fd754eb64d538b8a1a3020b970fe63d5.zip | |
ffmpeg: include networking support
add networking support to the default build, required by mpv
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 9a373c52278..13a339740f4 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, libiconv, lame, libass, libogg, libtheora -, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr, x264 -, xvidcore, zlib +, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg +, libtheora, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr +, x264, xvidcore, zlib , openglSupport ? false, mesa ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { else "--disable-pthreads --disable-w32threads") (ifMinVer "0.9" "--disable-os2threads") # We don't support OS/2 + "--enable-network" (ifMinVer "2.4" "--enable-pixelutils") # Executables "--enable-ffmpeg" @@ -105,6 +106,7 @@ stdenv.mkDerivation rec { (ifMinVer "0.6" "--disable-doc") # External Libraries "--enable-bzlib" + "--enable-gnutls" (ifMinVer "1.0" "--enable-fontconfig") (ifMinVer "0.7" "--enable-libfreetype") "--enable-libmp3lame" @@ -134,8 +136,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; buildInputs = [ - bzip2 fontconfig freetype libiconv lame libass libogg libtheora libvdpau - libvorbis lzma SDL soxr x264 xvidcore zlib + bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora + libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib ] ++ optional openglSupport mesa ++ optionals (!isDarwin) [ libvpx pulseaudio ] # Need to be fixed on Darwin ++ optional (isLinux || isFreeBSD) libva |