diff options
| author | joachifm <joachifm@users.noreply.github.com> | 2016-03-03 14:33:35 +0000 |
|---|---|---|
| committer | joachifm <joachifm@users.noreply.github.com> | 2016-03-03 14:33:35 +0000 |
| commit | 3b7b3da906c16cd873b9b7c4fcd190c2b884fd32 (patch) | |
| tree | c83af24a4d5de378b234ae219bbca13547215feb | |
| parent | ddb5f285444535ebe252bea38f1959fdc44f0579 (diff) | |
| parent | 0bcf42aed390ca645738ff35a3e9f0e9669cdd6d (diff) | |
| download | nixpkgs-3b7b3da906c16cd873b9b7c4fcd190c2b884fd32.tar nixpkgs-3b7b3da906c16cd873b9b7c4fcd190c2b884fd32.tar.gz nixpkgs-3b7b3da906c16cd873b9b7c4fcd190c2b884fd32.tar.bz2 nixpkgs-3b7b3da906c16cd873b9b7c4fcd190c2b884fd32.tar.lz nixpkgs-3b7b3da906c16cd873b9b7c4fcd190c2b884fd32.tar.xz nixpkgs-3b7b3da906c16cd873b9b7c4fcd190c2b884fd32.tar.zst nixpkgs-3b7b3da906c16cd873b9b7c4fcd190c2b884fd32.zip | |
Merge pull request #13637 from regnat/wayland
mpv: added optional wayland support
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 5bc2eee2414..a38ab6e9b3d 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -21,6 +21,7 @@ , youtubeSupport ? true, youtube-dl ? null , cacaSupport ? true, libcaca ? null , vaapiSupport ? false, libva ? null +, waylandSupport ? false, wayland ? null, libxkbcommon ? null }: assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null); @@ -41,6 +42,7 @@ assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; assert youtubeSupport -> youtube-dl != null; assert cacaSupport -> libcaca != null; +assert waylandSupport -> (wayland != null && libxkbcommon != null); let inherit (stdenv.lib) optional optionals optionalString; @@ -77,7 +79,8 @@ stdenv.mkDerivation rec { "--enable-manpage-build" "--disable-build-date" # Purity "--enable-zsh-comp" - ] ++ optional vaapiSupport "--enable-vaapi"; + ] ++ optional vaapiSupport "--enable-vaapi" + ++ optional waylandSupport "--enable-wayland"; configurePhase = '' python ${waf} configure --prefix=$out $configureFlags @@ -105,7 +108,8 @@ stdenv.mkDerivation rec { ++ optional youtubeSupport youtube-dl ++ optional sdl2Support SDL2 ++ optional cacaSupport libcaca - ++ optional vaapiSupport libva; + ++ optional vaapiSupport libva + ++ optionals waylandSupport [ wayland libxkbcommon ]; enableParallelBuilding = true; @@ -139,6 +143,5 @@ stdenv.mkDerivation rec { ''; }; } -# TODO: Wayland support # TODO: investigate caca support # TODO: investigate lua5_sockets bug |