ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-24 22:27:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13637 from regnat/wayland

Browse Source 
mpv: added optional wayland support
This commit is contained in:
joachifm 2016-03-03 14:33:35 +00:00
commit 3b7b3da906
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@
, youtubeSupport ? true, youtube-dl ? null , youtubeSupport ? true, youtube-dl ? null
, cacaSupport ? true, libcaca ? null , cacaSupport ? true, libcaca ? null
, vaapiSupport ? false, libva ? null , vaapiSupport ? false, libva ? null
, waylandSupport ? false, wayland ? null, libxkbcommon ? null
}: }:
assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null); assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
@ -41,6 +42,7 @@ assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null; assert libpngSupport -> libpng != null;
assert youtubeSupport -> youtube-dl != null; assert youtubeSupport -> youtube-dl != null;
assert cacaSupport -> libcaca != null; assert cacaSupport -> libcaca != null;
assert waylandSupport -> (wayland != null && libxkbcommon != null);
let let
inherit (stdenv.lib) optional optionals optionalString; inherit (stdenv.lib) optional optionals optionalString;
@ -77,7 +79,8 @@ stdenv.mkDerivation rec {
"--enable-manpage-build" "--enable-manpage-build"
"--disable-build-date" # Purity "--disable-build-date" # Purity
"--enable-zsh-comp" "--enable-zsh-comp"
] ++ optional vaapiSupport "--enable-vaapi"; ] ++ optional vaapiSupport "--enable-vaapi"
++ optional waylandSupport "--enable-wayland";
configurePhase = '' configurePhase = ''
python ${waf} configure --prefix=$out $configureFlags python ${waf} configure --prefix=$out $configureFlags
@ -105,7 +108,8 @@ stdenv.mkDerivation rec {
++ optional youtubeSupport youtube-dl ++ optional youtubeSupport youtube-dl
++ optional sdl2Support SDL2 ++ optional sdl2Support SDL2
++ optional cacaSupport libcaca ++ optional cacaSupport libcaca
++ optional vaapiSupport libva; ++ optional vaapiSupport libva
++ optionals waylandSupport [ wayland libxkbcommon ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -139,6 +143,5 @@ stdenv.mkDerivation rec {
''; '';
}; };
} }
# TODO: Wayland support
# TODO: investigate caca support # TODO: investigate caca support
# TODO: investigate lua5_sockets bug # TODO: investigate lua5_sockets bug