diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-04-14 21:01:16 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-04-14 21:01:16 +0000 |
commit | b8969ff4aecc1e354a1235168d92cc360d6a209d (patch) | |
tree | 4afa3bb91cb6ed533bf0d15c20339b9563188516 /pkgs/applications/video | |
parent | 6a18dcab449496c47e8d920e568eceb4a6101994 (diff) |
Making mplayer compile with mesa, so it gets 'gl' output.
svn path=/nixpkgs/trunk/; revision=15041
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/MPlayer/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index e8fb187e0491..06135d2e1ef5 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -4,6 +4,7 @@ , alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null , libXinerama ? null, libXrandr ? null, libdvdnav ? null , cdparanoia ? null, cddaSupport ? true +, mesa }: assert alsaSupport -> alsa != null; @@ -36,7 +37,7 @@ stdenv.mkDerivation { }; buildInputs = - [x11 libXv freetype zlib] + [x11 libXv freetype zlib mesa] ++ stdenv.lib.optional alsaSupport alsa ++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional theoraSupport libtheora |