summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-09-27 05:29:30 -0400
committerGitHub <noreply@github.com>2019-09-27 05:29:30 -0400
commit1c12e864cdbb20a00f0cf0b685989fd092f1f51d (patch)
tree60121edfb531c689f0b985800ae92d99402797e8 /pkgs/applications/video
parent6181a20ab2597c1961bf640d469953e9b3d549f9 (diff)
parent1e2602780261fdbfb45e85b112a8ad41d5fbfe71 (diff)
downloadnixpkgs-1c12e864cdbb20a00f0cf0b685989fd092f1f51d.tar
nixpkgs-1c12e864cdbb20a00f0cf0b685989fd092f1f51d.tar.gz
nixpkgs-1c12e864cdbb20a00f0cf0b685989fd092f1f51d.tar.bz2
nixpkgs-1c12e864cdbb20a00f0cf0b685989fd092f1f51d.tar.lz
nixpkgs-1c12e864cdbb20a00f0cf0b685989fd092f1f51d.tar.xz
nixpkgs-1c12e864cdbb20a00f0cf0b685989fd092f1f51d.tar.zst
nixpkgs-1c12e864cdbb20a00f0cf0b685989fd092f1f51d.zip
Merge pull request #69394 from esclear/master
vlc: Add libssh2 as dependency to support sftp inputs
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/vlc/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index a38076ca42b..2396a224d45 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -5,7 +5,7 @@
 , libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp
 , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
 , mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
-, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
+, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz
 , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
 , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
 , onlyLibVLC ? false
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
     libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
     systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
-    libkate libtiger libv4l samba liboggz libass libdvbpsi libva
+    libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
     xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
     libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
     fluidsynth wayland wayland-protocols