Merge pull request #6863 from bencef/jack2mplayer

mplayer: add (optionally) jack to NIX_LDFLAGS

lethalman fc7511f9 3af17021

+1 -1
+1 -1
pkgs/applications/video/mplayer/default.nix
··· 154 ${if speexSupport then "--enable-speex" else "--disable-speex"} 155 ${if theoraSupport then "--enable-theora" else "--disable-theora"} 156 ${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"} 157 - ${if jackaudioSupport then "--enable-jack" else "--disable-jack"} 158 ${if pulseSupport then "--enable-pulse" else "--disable-pulse"} 159 ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} 160 ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
··· 154 ${if speexSupport then "--enable-speex" else "--disable-speex"} 155 ${if theoraSupport then "--enable-theora" else "--disable-theora"} 156 ${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"} 157 + ${if jackaudioSupport then "" else "--disable-jack"} 158 ${if pulseSupport then "--enable-pulse" else "--disable-pulse"} 159 ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} 160 ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}