summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2013-04-04 12:50:09 +0200
committerLluís Batlle i Rossell <viric@viric.name>2013-04-05 10:45:03 +0200
commit48f534bce9a0f03fe644c2c31b357a7b695138f7 (patch)
treef2c0a1efdb7550cc46dccb08ac209455930afe8f /pkgs/applications/video
parent0013355b19673aeabad6b5762c03cadab4f696ee (diff)
downloadnixlib-48f534bce9a0f03fe644c2c31b357a7b695138f7.tar
nixlib-48f534bce9a0f03fe644c2c31b357a7b695138f7.tar.gz
nixlib-48f534bce9a0f03fe644c2c31b357a7b695138f7.tar.bz2
nixlib-48f534bce9a0f03fe644c2c31b357a7b695138f7.tar.lz
nixlib-48f534bce9a0f03fe644c2c31b357a7b695138f7.tar.xz
nixlib-48f534bce9a0f03fe644c2c31b357a7b695138f7.tar.zst
nixlib-48f534bce9a0f03fe644c2c31b357a7b695138f7.zip
mplayer2: add reference to libXxf86vm
Otherwise, playing h264 with vdpau complains about not able to sync to vsync.
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/mplayer2/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix
index 2f35d02eb906..9e89d5384147 100644
--- a/pkgs/applications/video/mplayer2/default.nix
+++ b/pkgs/applications/video/mplayer2/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchgit, freetype, pkgconfig, yasm, freefont_ttf, ffmpeg, libass
 , python3, docutils, which
-, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null
+, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
 , xineramaSupport ? true, libXinerama ? null
 , xvSupport ? true, libXv ? null
 , alsaSupport ? true, alsaLib ? null
@@ -17,7 +17,7 @@
 , useUnfreeCodecs ? false
 }:
 
-assert x11Support -> (libX11 != null && libXext != null && mesa != null);
+assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
 assert xineramaSupport -> (libXinerama != null && x11Support);
 assert xvSupport -> (libXv != null && x11Support);
 assert alsaSupport -> alsaLib != null;
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with stdenv.lib;
     [ freetype pkgconfig ffmpeg libass docutils which ]
-    ++ optionals x11Support [ libX11 libXext mesa ]
+    ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
     ++ optional alsaSupport alsaLib
     ++ optional xvSupport libXv
     ++ optional theoraSupport libtheora