diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 7ce8f0ed789d..e2c25c3360ce 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -8,7 +8,8 @@ , jackaudioSupport ? false, jackaudio ? null , x264Support ? false, x264 ? null , xvidSupport ? false, xvidcore ? null -, mesa, pkgconfig, unzip +, lameSupport ? true, lame ? null +, mesa, pkgconfig, unzip, yasm }: assert alsaSupport -> alsa != null; @@ -53,7 +54,7 @@ stdenv.mkDerivation { }; buildInputs = - [ x11 libXv freetype zlib mesa pkgconfig ] + [ x11 libXv freetype zlib mesa pkgconfig yasm ] ++ stdenv.lib.optional alsaSupport alsa ++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional theoraSupport libtheora @@ -65,7 +66,8 @@ stdenv.mkDerivation { ++ stdenv.lib.optional jackaudioSupport jackaudio ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ] ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore; + ++ stdenv.lib.optional xvidSupport xvidcore + ++ stdenv.lib.optional lameSupport lame; 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 928baa70c24f..f4820cc7d817 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8189,7 +8189,7 @@ let MPlayer = import ../applications/video/MPlayer { inherit fetchurl stdenv freetype fontconfig x11 zlib libtheora libcaca libdvdnav - cdparanoia mesa pkgconfig unzip amrnb amrwb jackaudio x264 xvidcore; + cdparanoia mesa pkgconfig unzip amrnb amrwb jackaudio x264 xvidcore lame yasm; inherit (xlibs) libX11 libXv libXinerama libXrandr; alsaSupport = true; alsa = alsaLib;