diff options
| author | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-01-21 21:37:57 -0300 |
|---|---|---|
| committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-01-23 11:20:24 -0300 |
| commit | fa74c63bdc1065e51486ce3d687db64c2105191d (patch) | |
| tree | 38720a6b87ff158943157656993248e81b860964 /pkgs/applications/video/vlc | |
| parent | 745802b18e7779684796fb93d60d44cdb5bf0f00 (diff) | |
vlc: optional Wayland support
Diffstat (limited to 'pkgs/applications/video/vlc')
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 7706c425f2bc4..1efebb6fdf559 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -62,16 +62,14 @@ , systemd , taglib , unzip -, wayland -, wayland-protocols , xorg , zlib - , chromecastSupport ? true, libmicrodns, protobuf , jackSupport ? false , onlyLibVLC ? false , skins2Support ? !onlyLibVLC, freetype -, withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook +, waylandSupport ? true, wayland, wayland-protocols +, withQt5 ? true, qtbase, qtsvg, qtwayland, qtx11extras, wrapQtAppsHook }: # chromecastSupport requires TCP port 8010 to be open for it to work. @@ -148,8 +146,6 @@ stdenv.mkDerivation rec { srt systemd taglib - wayland - wayland-protocols zlib ] ++ (with xorg; [ @@ -162,8 +158,15 @@ stdenv.mkDerivation rec { ++ optional (!hostIsAarch) live555 ++ optional jackSupport libjack2 ++ optionals chromecastSupport [ libmicrodns protobuf ] - ++ optionals skins2Support (with xorg; [ freetype libXext libXinerama libXpm ]) - ++ optionals withQt5 [ qtbase qtsvg qtx11extras ]; + ++ optionals skins2Support (with xorg; [ + freetype + libXext + libXinerama + libXpm + ]) + ++ optionals waylandSupport [ wayland wayland-protocols ] + ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] + ++ optional (waylandSupport && withQt5) qtwayland; nativeBuildInputs = [ autoreconfHook @@ -172,7 +175,8 @@ stdenv.mkDerivation rec { removeReferencesTo unzip ] - ++ optionals withQt5 [ wrapQtAppsHook ]; + ++ optionals withQt5 [ wrapQtAppsHook ] + ++ optionals waylandSupport [ wayland wayland-protocols ]; enableParallelBuilding = true; @@ -210,9 +214,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-srt" # Explicit enable srt to ensure the patch is applied. "--with-kde-solid=$out/share/apps/solid/actions" - ] ++ optional onlyLibVLC "--disable-vlc" - ++ optional skins2Support "--enable-skins2" - ++ optionals chromecastSupport [ + ] + ++ optional onlyLibVLC "--disable-vlc" + ++ optional skins2Support "--enable-skins2" + ++ optional waylandSupport "--enable-wayland" + ++ optionals chromecastSupport [ "--enable-sout" "--enable-chromecast" "--enable-microdns" |