summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorMarc Weber <marco-oweber@gmx.de>2009-09-21 10:09:24 +0000
committerMarc Weber <marco-oweber@gmx.de>2009-09-21 10:09:24 +0000
commit0ba0fefa954af2c737e661a54ad09f2fe82b1269 (patch)
treed21effc959321e13bab55f39d10ed13f13045975 /pkgs/applications
parentc28aeffc87b76f12548aba17ffccfcb29b1c4744 (diff)
downloadnixlib-0ba0fefa954af2c737e661a54ad09f2fe82b1269.tar
nixlib-0ba0fefa954af2c737e661a54ad09f2fe82b1269.tar.gz
nixlib-0ba0fefa954af2c737e661a54ad09f2fe82b1269.tar.bz2
nixlib-0ba0fefa954af2c737e661a54ad09f2fe82b1269.tar.lz
nixlib-0ba0fefa954af2c737e661a54ad09f2fe82b1269.tar.xz
nixlib-0ba0fefa954af2c737e661a54ad09f2fe82b1269.tar.zst
nixlib-0ba0fefa954af2c737e661a54ad09f2fe82b1269.zip
mplayer-trunk: build with jackaudio support
svn path=/nixpkgs/trunk/; revision=17329
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/video/MPlayer/trunk.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/video/MPlayer/trunk.nix b/pkgs/applications/video/MPlayer/trunk.nix
index 29fbe04391a2..785ffe727dbf 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"}