pyrox.dev
lol
Merge pull request #8038 from codyopel/ffmpeg-networking
ffmpeg: include networking support
+7
-5
+7
-5
pkgs/development/libraries/ffmpeg/generic.nix
+7
-5
pkgs/development/libraries/ffmpeg/generic.nix
···
1
1
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
2
-
, alsaLib, bzip2, fontconfig, freetype, libiconv, lame, libass, libogg, libtheora
3
-
, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr, x264
4
-
, xvidcore, zlib
2
+
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
3
+
, libtheora, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr
4
+
, x264, xvidcore, zlib
5
5
, openglSupport ? false, mesa ? null
6
6
# Build options
7
7
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
···
85
85
else
86
86
"--disable-pthreads --disable-w32threads")
87
87
(ifMinVer "0.9" "--disable-os2threads") # We don't support OS/2
88
+
"--enable-network"
88
89
(ifMinVer "2.4" "--enable-pixelutils")
89
90
# Executables
90
91
"--enable-ffmpeg"
···
105
106
(ifMinVer "0.6" "--disable-doc")
106
107
# External Libraries
107
108
"--enable-bzlib"
109
+
"--enable-gnutls"
108
110
(ifMinVer "1.0" "--enable-fontconfig")
109
111
(ifMinVer "0.7" "--enable-libfreetype")
110
112
"--enable-libmp3lame"
···
134
136
nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
135
137
136
138
buildInputs = [
137
-
bzip2 fontconfig freetype libiconv lame libass libogg libtheora libvdpau
138
-
libvorbis lzma SDL soxr x264 xvidcore zlib
139
+
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
140
+
libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib
139
141
] ++ optional openglSupport mesa
140
142
++ optionals (!isDarwin) [ libvpx pulseaudio ] # Need to be fixed on Darwin
141
143
++ optional (isLinux || isFreeBSD) libva