Skip to content

Commit

Permalink
mpv: fix build with wayland after #41902
Browse files Browse the repository at this point in the history
  • Loading branch information
orivej committed Jul 3, 2018
1 parent 352b957 commit 6b404b9
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions pkgs/applications/video/mpv/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
]);
Expand Down

0 comments on commit 6b404b9

Please sign in to comment.