diff options
author | muflax <mail@muflax.com> | 2014-09-27 07:06:54 +0100 |
---|---|---|
committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-09-27 08:20:30 +0100 |
commit | 5861898fc2d8dcb7b38c4a1c4b588c2b92c7cb7e (patch) | |
tree | 6d8f6f2cd4235ab53147285fcc751a5611a11b89 /pkgs/applications/video/mplayer | |
parent | ff8f23ab2614d90869cc2191590a8276c3940626 (diff) | |
download | nixlib-5861898fc2d8dcb7b38c4a1c4b588c2b92c7cb7e.tar nixlib-5861898fc2d8dcb7b38c4a1c4b588c2b92c7cb7e.tar.gz nixlib-5861898fc2d8dcb7b38c4a1c4b588c2b92c7cb7e.tar.bz2 nixlib-5861898fc2d8dcb7b38c4a1c4b588c2b92c7cb7e.tar.lz nixlib-5861898fc2d8dcb7b38c4a1c4b588c2b92c7cb7e.tar.xz nixlib-5861898fc2d8dcb7b38c4a1c4b588c2b92c7cb7e.tar.zst nixlib-5861898fc2d8dcb7b38c4a1c4b588c2b92c7cb7e.zip |
add jpeg support to mplayer and mplayer2
Closes #4288
Diffstat (limited to 'pkgs/applications/video/mplayer')
-rw-r--r-- | pkgs/applications/video/mplayer/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 07bcb26569e9..dec3a5fc28da 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -21,6 +21,7 @@ , bs2bSupport ? false, libbs2b ? null # For screenshots , libpngSupport ? true, libpng ? null +, libjpegSupport ? true, libjpeg ? null , useUnfreeCodecs ? false }: @@ -46,6 +47,7 @@ assert jackaudioSupport -> jack2 != null; assert pulseSupport -> pulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; +assert libjpegSupport -> libjpeg != null; let @@ -121,6 +123,7 @@ stdenv.mkDerivation rec { ++ optional vdpauSupport libvdpau ++ optional speexSupport speex ++ optional libpngSupport libpng + ++ optional libjpegSupport libjpeg ++ optional bs2bSupport libbs2b ; |