diff --git a/pkgs/applications/video/MPlayer/trunk.nix b/pkgs/applications/video/MPlayer/trunk.nix index 29fbe04391a..785ffe727db 100644 --- a/pkgs/applications/video/MPlayer/trunk.nix +++ b/pkgs/applications/video/MPlayer/trunk.nix @@ -3,8 +3,8 @@ , xineramaSupport ? false, randrSupport ? false, dvdnavSupport ? true , stdenv, fetchurl, x11, freetype, freefont_ttf, zlib , alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null -, libXinerama ? null, libXrandr ? null, libdvdnav ? null -, cdparanoia ? null, cddaSupport ? true +, libXinerama ? null, libXrandr ? null, libdvdnav ? null, jackaudio ? null +, cdparanoia ? null, cddaSupport ? true, jackaudioSupport ? true , mesa, pkgconfig , sourceByName }: @@ -17,6 +17,7 @@ assert xineramaSupport -> libXinerama != null; assert randrSupport -> libXrandr != null; assert dvdnavSupport -> libdvdnav != null; assert cddaSupport -> cdparanoia != null; +assert jackaudioSupport -> jackaudio != null; let @@ -45,7 +46,8 @@ stdenv.mkDerivation { ++ stdenv.lib.optional xineramaSupport libXinerama ++ stdenv.lib.optional randrSupport libXrandr ++ stdenv.lib.optionals dvdnavSupport [libdvdnav libdvdnav.libdvdread] - ++ stdenv.lib.optional cddaSupport cdparanoia; + ++ stdenv.lib.optional cddaSupport cdparanoia + ++ stdenv.lib.optional jackaudioSupport jackaudio; configureFlags = '' ${if cacaSupport then "--enable-caca" else "--disable-caca"} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fbd26056da..7a96521b05b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7133,7 +7133,7 @@ let MPlayerTrunk = import ../applications/video/MPlayer/trunk.nix { inherit (bleedingEdgeRepos) sourceByName; inherit fetchurl stdenv freetype x11 zlib libtheora libcaca freefont_ttf libdvdnav - cdparanoia mesa pkgconfig; + cdparanoia mesa pkgconfig jackaudio; inherit (xlibs) libX11 libXv libXinerama libXrandr; alsaSupport = true; alsa = alsaLib;