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

Making mplayer compile with mesa, so it gets 'gl' output.

Browse Source 
svn path=/nixpkgs/trunk/; revision=15041
This commit is contained in:
Lluís Batlle i Rossell 2009-04-14 21:01:16 +00:00
parent 6a18dcab44
commit b8969ff4ae
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/video/MPlayer/default.nix
View File

@ -4,6 +4,7 @@
, 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
, cdparanoia ? null, cddaSupport ? true , cdparanoia ? null, cddaSupport ? true
, mesa
}: }:
assert alsaSupport -> alsa != null; assert alsaSupport -> alsa != null;
@ -36,7 +37,7 @@ stdenv.mkDerivation {
}; };
buildInputs = buildInputs =
[x11 libXv freetype zlib] [x11 libXv freetype zlib mesa]
++ stdenv.lib.optional alsaSupport alsa ++ stdenv.lib.optional alsaSupport alsa
++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional xvSupport libXv
++ stdenv.lib.optional theoraSupport libtheora ++ stdenv.lib.optional theoraSupport libtheora

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

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