public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104865 from berbiche/mpv-sixel 

mpv: enable sixel support
This commit is contained in:
Anderson Torres 2020-11-25 16:16:00 -03:00 committed by GitHub
parent c46bb0cca1 9c2351cf27
commit f9677bad79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,28 +31,29 @@
, mesa ? null , mesa ? null
, alsaSupport ? stdenv.isLinux, alsaLib ? null , alsaSupport ? stdenv.isLinux, alsaLib ? null
, archiveSupport ? true, libarchive ? null
, bluraySupport ? true, libbluray ? null , bluraySupport ? true, libbluray ? null
, bs2bSupport ? true, libbs2b ? null , bs2bSupport ? true, libbs2b ? null
, cacaSupport ? true, libcaca ? null , cacaSupport ? true, libcaca ? null
, cmsSupport ? true, lcms2 ? null , cmsSupport ? true, lcms2 ? null
, dvdnavSupport ? stdenv.isLinux, libdvdnav ? null , dvdnavSupport ? stdenv.isLinux, libdvdnav ? null
, jackaudioSupport ? false, libjack2 ? null
, libpngSupport ? true, libpng ? null , libpngSupport ? true, libpng ? null
, openalSupport ? true, openalSoft ? null
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
, rubberbandSupport ? stdenv.isLinux, rubberband ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null
, screenSaverSupport ? true, libXScrnSaver ? null , screenSaverSupport ? true, libXScrnSaver ? null
, sdl2Support ? true, SDL2 ? null , sdl2Support ? true, SDL2 ? null
, sixelSupport ? false, libsixel ? null
, speexSupport ? true, speex ? null , speexSupport ? true, speex ? null
, swiftSupport ? false, swift ? null , swiftSupport ? false, swift ? null
, theoraSupport ? true, libtheora ? null , theoraSupport ? true, libtheora ? null
, vaapiSupport ? stdenv.isLinux, libva ? null , vaapiSupport ? stdenv.isLinux, libva ? null
, vapoursynthSupport ? false, vapoursynth ? null
, vdpauSupport ? true, libvdpau ? null , vdpauSupport ? true, libvdpau ? null
, xineramaSupport ? stdenv.isLinux, libXinerama ? null , xineramaSupport ? stdenv.isLinux, libXinerama ? null
, xvSupport ? stdenv.isLinux, libXv ? null , xvSupport ? stdenv.isLinux, libXv ? null
, zimgSupport ? true, zimg ? null , zimgSupport ? true, zimg ? null
, archiveSupport ? true, libarchive ? null
, jackaudioSupport ? false, libjack2 ? null
, openalSupport ? true, openalSoft ? null
, vapoursynthSupport ? false, vapoursynth ? null
}: }:
with stdenv.lib; with stdenv.lib;
@ -76,6 +77,7 @@ assert pulseSupport -> available libpulseaudio;
assert rubberbandSupport -> available rubberband; assert rubberbandSupport -> available rubberband;
assert screenSaverSupport -> available libXScrnSaver; assert screenSaverSupport -> available libXScrnSaver;
assert sdl2Support -> available SDL2; assert sdl2Support -> available SDL2;
assert sixelSupport -> available libsixel;
assert speexSupport -> available speex; assert speexSupport -> available speex;
assert theoraSupport -> available libtheora; assert theoraSupport -> available libtheora;
assert vaapiSupport -> available libva; assert vaapiSupport -> available libva;
@ -134,6 +136,7 @@ in stdenv.mkDerivation rec {
(enableFeature dvdnavSupport "dvdnav") (enableFeature dvdnavSupport "dvdnav")
(enableFeature openalSupport "openal") (enableFeature openalSupport "openal")
(enableFeature sdl2Support "sdl2") (enableFeature sdl2Support "sdl2")
(enableFeature sixelSupport "sixel")
(enableFeature vaapiSupport "vaapi") (enableFeature vaapiSupport "vaapi")
(enableFeature waylandSupport "wayland") (enableFeature waylandSupport "wayland")
(enableFeature stdenv.isLinux "dvbin") (enableFeature stdenv.isLinux "dvbin")
@ -161,6 +164,7 @@ in stdenv.mkDerivation rec {
++ optional rubberbandSupport rubberband ++ optional rubberbandSupport rubberband
++ optional screenSaverSupport libXScrnSaver ++ optional screenSaverSupport libXScrnSaver
++ optional sdl2Support SDL2 ++ optional sdl2Support SDL2
++ optional sixelSupport libsixel
++ optional speexSupport speex ++ optional speexSupport speex
++ optional theoraSupport libtheora ++ optional theoraSupport libtheora
++ optional vaapiSupport libva ++ optional vaapiSupport libva