From b8969ff4aecc1e354a1235168d92cc360d6a209d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 14 Apr 2009 21:01:16 +0000
Subject: [PATCH] Making mplayer compile with mesa, so it gets 'gl' output.

svn path=/nixpkgs/trunk/; revision=15041
---
 pkgs/applications/video/MPlayer/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index e8fb187e049..06135d2e1ef 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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef130f70a25..22baf3139ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8631,7 +8631,7 @@ let
 
   MPlayer = import ../applications/video/MPlayer {
     inherit fetchurl stdenv freetype x11 zlib libtheora libcaca freefont_ttf libdvdnav
-      cdparanoia;
+      cdparanoia mesa;
     inherit (xlibs) libX11 libXv libXinerama libXrandr;
     alsaSupport = true;
     alsa = alsaLib;