diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-15 13:25:01 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-15 13:25:01 +0000 |
| commit | a4c304ef84cbb775948265db9ab026b78277fa20 (patch) | |
| tree | 5c8cc27b0e242f806a550e913bf237859548e725 /pkgs/applications/video | |
| parent | f5a2b4f7a3bf8a7d43e4e875be7697723b5c115f (diff) | |
| parent | 871717cd5ad48843a54e40aa95618b100a8d9ed7 (diff) | |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
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 ed65e76414a2..cc1306a20a58 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 |