From 6b404b944a5f041b47fa1d57b74bb72f563a5014 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 3 Jul 2018 12:32:41 +0000 Subject: mpv: fix build with wayland after #41902 --- pkgs/applications/video/mpv/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs/applications/video') diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 58628aa1f8e8..8cbf32d99f83 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -9,9 +9,10 @@ libXext ? null, libXxf86vm ? null -, waylandSupport ? false, - wayland ? null, - libxkbcommon ? null +, waylandSupport ? false + , wayland ? null + , wayland-protocols ? null + , libxkbcommon ? null , rubberbandSupport ? true, rubberband ? null , xineramaSupport ? true, libXinerama ? null @@ -47,7 +48,7 @@ let available = x: x != null; in assert x11Support -> all available [libGLU_combined libX11 libXext libXxf86vm]; -assert waylandSupport -> all available [wayland libxkbcommon]; +assert waylandSupport -> all available [wayland wayland-protocols libxkbcommon]; assert rubberbandSupport -> available rubberband; assert xineramaSupport -> x11Support && available libXinerama; assert xvSupport -> x11Support && available libXv; @@ -151,7 +152,7 @@ in stdenv.mkDerivation rec { ++ optional archiveSupport libarchive ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm ] - ++ optionals waylandSupport [ wayland libxkbcommon ] + ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ libiconv Cocoa CoreAudio ]); -- cgit 1.4.1