diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2014-01-15 17:04:14 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2014-01-15 17:04:14 +0100 |
| commit | cb35bf15a46eb8239b7f331f0e78bee5d580ec96 (patch) | |
| tree | 81d434dafa6297314c9ec468a4ef9de0009126ac /pkgs/applications/video | |
| parent | 4fe0bf9ecbb490e74d2e953492bfa067fca4ebf3 (diff) | |
| download | nixlib-cb35bf15a46eb8239b7f331f0e78bee5d580ec96.tar nixlib-cb35bf15a46eb8239b7f331f0e78bee5d580ec96.tar.gz nixlib-cb35bf15a46eb8239b7f331f0e78bee5d580ec96.tar.bz2 nixlib-cb35bf15a46eb8239b7f331f0e78bee5d580ec96.tar.lz nixlib-cb35bf15a46eb8239b7f331f0e78bee5d580ec96.tar.xz nixlib-cb35bf15a46eb8239b7f331f0e78bee5d580ec96.tar.zst nixlib-cb35bf15a46eb8239b7f331f0e78bee5d580ec96.zip | |
ffmpeg: adding gnutls support
I also take out the useless 'openssl' I added by error to mpv.
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index d9bef0fd8770..a20dc0cf590e 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -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 |