Commit af834c4d authored by Anderson Torres's avatar Anderson Torres
Browse files

vlc: reenable libcaca

parent d94b20d8

pkgs/applications/video/vlc/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -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 ]

pkgs/top-level/all-packages.nix

+1 −6
Original line number Diff line number Diff line
@@ -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;