public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg: adding gnutls support

Browse Source 
I also take out the useless 'openssl' I added by error to mpv.
This commit is contained in:
Lluís Batlle i Rossell
2014-01-15 17:04:14 +01:00
parent 4fe0bf9ecb
commit cb35bf15a4
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/video/mpv/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass
, lua5, perl, libpthreadstubs, openssl
, lua5, perl, libpthreadstubs
, python3, docutils, which
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
, xineramaSupport ? true, libXinerama ? null
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
};
buildInputs = with stdenv.lib;
[ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs openssl ]
[ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs ]
++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
++ optional alsaSupport alsaLib
++ optional xvSupport libXv