diff options
| author | lethalman <lucabru@src.gnome.org> | 2015-03-23 10:55:14 +0100 |
|---|---|---|
| committer | lethalman <lucabru@src.gnome.org> | 2015-03-23 10:55:14 +0100 |
| commit | fc7511f9a072e7703b6b5638f02301d135db9831 (patch) | |
| tree | 03cafc014f22fa6eac27def0a4cf02f6c30fcc09 /pkgs/applications | |
| parent | 3af17021d4f6379acb2d81cdb015435c202ffa12 (diff) | |
| parent | 2aa9da5a063ff25dd4f0e82d4761d24234b16628 (diff) | |
| download | nixlib-fc7511f9a072e7703b6b5638f02301d135db9831.tar nixlib-fc7511f9a072e7703b6b5638f02301d135db9831.tar.gz nixlib-fc7511f9a072e7703b6b5638f02301d135db9831.tar.bz2 nixlib-fc7511f9a072e7703b6b5638f02301d135db9831.tar.lz nixlib-fc7511f9a072e7703b6b5638f02301d135db9831.tar.xz nixlib-fc7511f9a072e7703b6b5638f02301d135db9831.tar.zst nixlib-fc7511f9a072e7703b6b5638f02301d135db9831.zip | |
Merge pull request #6863 from bencef/jack2mplayer
mplayer: add (optionally) jack to NIX_LDFLAGS
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/video/mplayer/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 86e5d9cb9eb0..ac106431240d 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { ${if speexSupport then "--enable-speex" else "--disable-speex"} ${if theoraSupport then "--enable-theora" else "--disable-theora"} ${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"} - ${if jackaudioSupport then "--enable-jack" else "--disable-jack"} + ${if jackaudioSupport then "" else "--disable-jack"} ${if pulseSupport then "--enable-pulse" else "--disable-pulse"} ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} |