public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mplayer-trunk: build with jackaudio support

Browse Source 
svn path=/nixpkgs/trunk/; revision=17329
This commit is contained in:
Marc Weber 2009-09-21 10:09:24 +00:00
parent c28aeffc87
commit 0ba0fefa95
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/video/MPlayer/trunk.nix
View File

@ -3,8 +3,8 @@
, xineramaSupport ? false, randrSupport ? false, dvdnavSupport ? true , xineramaSupport ? false, randrSupport ? false, dvdnavSupport ? true
, stdenv, fetchurl, x11, freetype, freefont_ttf, zlib , stdenv, fetchurl, x11, freetype, freefont_ttf, zlib
, alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null , alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null
, libXinerama ? null, libXrandr ? null, libdvdnav ? null , libXinerama ? null, libXrandr ? null, libdvdnav ? null, jackaudio ? null
, cdparanoia ? null, cddaSupport ? true , cdparanoia ? null, cddaSupport ? true, jackaudioSupport ? true
, mesa, pkgconfig , mesa, pkgconfig
, sourceByName , sourceByName
}: }:
@ -17,6 +17,7 @@ assert xineramaSupport -> libXinerama != null;
assert randrSupport -> libXrandr != null; assert randrSupport -> libXrandr != null;
assert dvdnavSupport -> libdvdnav != null; assert dvdnavSupport -> libdvdnav != null;
assert cddaSupport -> cdparanoia != null; assert cddaSupport -> cdparanoia != null;
assert jackaudioSupport -> jackaudio != null;
let let
@ -45,7 +46,8 @@ stdenv.mkDerivation {
++ stdenv.lib.optional xineramaSupport libXinerama ++ stdenv.lib.optional xineramaSupport libXinerama
++ stdenv.lib.optional randrSupport libXrandr ++ stdenv.lib.optional randrSupport libXrandr
++ stdenv.lib.optionals dvdnavSupport [libdvdnav libdvdnav.libdvdread] ++ stdenv.lib.optionals dvdnavSupport [libdvdnav libdvdnav.libdvdread]
++ stdenv.lib.optional cddaSupport cdparanoia; ++ stdenv.lib.optional cddaSupport cdparanoia
++ stdenv.lib.optional jackaudioSupport jackaudio;
configureFlags = '' configureFlags = ''
${if cacaSupport then "--enable-caca" else "--disable-caca"} ${if cacaSupport then "--enable-caca" else "--disable-caca"}

2
pkgs/top-level/all-packages.nix
View File

@ -7133,7 +7133,7 @@ let
MPlayerTrunk = import ../applications/video/MPlayer/trunk.nix { MPlayerTrunk = import ../applications/video/MPlayer/trunk.nix {
inherit (bleedingEdgeRepos) sourceByName; inherit (bleedingEdgeRepos) sourceByName;
inherit fetchurl stdenv freetype x11 zlib libtheora libcaca freefont_ttf libdvdnav inherit fetchurl stdenv freetype x11 zlib libtheora libcaca freefont_ttf libdvdnav
cdparanoia mesa pkgconfig; cdparanoia mesa pkgconfig jackaudio;
inherit (xlibs) libX11 libXv libXinerama libXrandr; inherit (xlibs) libX11 libXv libXinerama libXrandr;
alsaSupport = true; alsaSupport = true;
alsa = alsaLib; alsa = alsaLib;