about summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-02-12 00:36:19 +0000
committerGitHub <noreply@github.com>2021-02-12 00:36:19 +0000
commit344456f66a3f84bba46fa824a6f371447408e886 (patch)
tree2494a1839cd39cad1a59ddd470c7611a05969bc3 /pkgs/applications/video
parent402b75252162f81b3fe7d4b3539bbeecd2c451d6 (diff)
parent9704f74645d30a2713377ea49a1330141c1ada87 (diff)
Merge master into staging-next
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 c925eca302a87..f79899259602a 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, autoreconfHook
 , libarchive, perl, xorg, libdvdnav, libbluray
-, zlib, a52dec, libmad, faad2, ffmpeg_3, alsaLib
+, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
 , pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska
 , libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp
 , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   # which are not included here for no other reason that nobody has mentioned
   # needing them
   buildInputs = [
-    zlib a52dec libmad faad2 ffmpeg_3 alsaLib libdvdnav libdvdnav.libdvdread
+    zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
     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