Merge branch 'mplayer_vdpau' of git://github.com/matejc/nixpkgs

mplayer: add option config.mplayer.vdpauSupport
2014-03-23 20:54:59 -04:00
parent a2b6ec902c 6c9ecc1573
commit d4b28df8a2
1 changed files with 1 additions and 0 deletions
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8591,6 +8591,7 @@ let

  mplayer = callPackage ../applications/video/mplayer {
    pulseSupport = config.pulseaudio or false;
+    vdpauSupport = config.mplayer.vdpauSupport or false;
  };

  mplayer2 = callPackage ../applications/video/mplayer2 { };