dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

mpv: fix build with wayland after #41902

Browse Source
This commit is contained in:
Orivej Desh 2018-07-03 12:32:41 +00:00
parent 352b957a9a
commit 6b404b944a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/video/mpv/default.nix
View File

@ -9,9 +9,10 @@
libXext ? null, libXext ? null,
libXxf86vm ? null libXxf86vm ? null
, waylandSupport ? false, , waylandSupport ? false
wayland ? null, , wayland ? null
libxkbcommon ? null , wayland-protocols ? null
, libxkbcommon ? null
, rubberbandSupport ? true, rubberband ? null , rubberbandSupport ? true, rubberband ? null
, xineramaSupport ? true, libXinerama ? null , xineramaSupport ? true, libXinerama ? null
@ -47,7 +48,7 @@ let
available = x: x != null; available = x: x != null;
in in
assert x11Support -> all available [libGLU_combined libX11 libXext libXxf86vm]; 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 rubberbandSupport -> available rubberband;
assert xineramaSupport -> x11Support && available libXinerama; assert xineramaSupport -> x11Support && available libXinerama;
assert xvSupport -> x11Support && available libXv; assert xvSupport -> x11Support && available libXv;
@ -151,7 +152,7 @@ in stdenv.mkDerivation rec {
++ optional archiveSupport libarchive ++ optional archiveSupport libarchive
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm ] ++ 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; [ ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
libiconv Cocoa CoreAudio libiconv Cocoa CoreAudio
]); ]);