diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-07-07 13:11:08 -0300 |
|---|---|---|
| committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-07-07 18:14:21 -0300 |
| commit | af834c4dfb3115e684d2c7d2a491f1a8726c7f3d (patch) | |
| tree | 23637e25256f1e286618bab713e2da848e19fb41 | |
| parent | d94b20d8f0deb801ec83cca0037c0852bac00303 (diff) | |
vlc: reenable libcaca
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 40c39c79cbc34..c9c09cc07b2d3 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -90,7 +90,6 @@ , skins2Support ? !onlyLibVLC , waylandSupport ? true , withQt5 ? true -, withLibcaca ? true }: # chromecastSupport requires TCP port 8010 to be open for it to work. @@ -146,6 +145,7 @@ stdenv.mkDerivation (finalAttrs: { libarchive libass libbluray + libcaca libcddb libdc1394 libdvbpsi @@ -188,7 +188,6 @@ stdenv.mkDerivation (finalAttrs: { xcbutilkeysyms zlib ] - ++ optional withLibcaca libcaca ++ optional (!stdenv.hostPlatform.isAarch && !onlyLibVLC) live555 ++ optional jackSupport libjack2 ++ optionals chromecastSupport [ libmicrodns protobuf ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32772b2f78647..c9847af05129e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35592,12 +35592,7 @@ with pkgs; vkeybd = callPackage ../applications/audio/vkeybd { }; - vlc = libsForQt5.callPackage ../applications/video/vlc { - # Newest libcaca changed the API, and libvlc didn't catch it. Until next - # version arrives, it is safer to disable it. - # Upstream thread: https://code.videolan.org/videolan/vlc/-/issues/26389 - withLibcaca = false; - }; + vlc = libsForQt5.callPackage ../applications/video/vlc { }; libvlc = vlc.override { withQt5 = false; |