From c283fddea648f3fed0a0dbd89233048009dce8ea Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Mar 2015 17:13:32 +0000 Subject: [PATCH] mplayer: cleanup --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75106a639b0d..0149d894496b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11188,10 +11188,9 @@ let normalize = callPackage ../applications/audio/normalize { }; - mplayer = callPackage ../applications/video/mplayer { + mplayer = callPackage ../applications/video/mplayer ({ pulseSupport = config.pulseaudio or false; - vdpauSupport = config.mplayer.vdpauSupport or false; - }; + } // (config.mplayer or {})); mplayer2 = callPackage ../applications/video/mplayer2 { ffmpeg = libav_9; # see https://trac.macports.org/ticket/44386