diff options
| author | Théophane Hufschmitt <theophane.hufschmitt@polytechnique.org> | 2016-03-03 11:38:42 +0100 |
|---|---|---|
| committer | Théophane Hufschmitt <theophane.hufschmitt@polytechnique.org> | 2016-03-03 11:38:52 +0100 |
| commit | 0bcf42aed390ca645738ff35a3e9f0e9669cdd6d (patch) | |
| tree | 42fb0dd3775aab2fb89eac21616ceb65d67e4cb8 /pkgs/applications/video/mpv | |
| parent | c2a2c2ecd4055d4c47204e64c7e45d5f15060750 (diff) | |
| download | nixlib-0bcf42aed390ca645738ff35a3e9f0e9669cdd6d.tar nixlib-0bcf42aed390ca645738ff35a3e9f0e9669cdd6d.tar.gz nixlib-0bcf42aed390ca645738ff35a3e9f0e9669cdd6d.tar.bz2 nixlib-0bcf42aed390ca645738ff35a3e9f0e9669cdd6d.tar.lz nixlib-0bcf42aed390ca645738ff35a3e9f0e9669cdd6d.tar.xz nixlib-0bcf42aed390ca645738ff35a3e9f0e9669cdd6d.tar.zst nixlib-0bcf42aed390ca645738ff35a3e9f0e9669cdd6d.zip | |
mpv: added optional wayland support
Diffstat (limited to 'pkgs/applications/video/mpv')
| -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 5bc2eee24145..a38ab6e9b3df 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 |