From 488b43586cfb28301b53289fd758a841c9d9767c Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 3 Oct 2012 18:15:39 +0200 Subject: [PATCH] vlc: use ffmpeg 1.0 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f168bd0594..3da8ae00d45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7854,7 +7854,9 @@ let inherit (xlibs) libX11; }; - vlc = callPackage ../applications/video/vlc { }; + vlc = callPackage ../applications/video/vlc { + ffmpeg = ffmpeg_1_0; + }; vnstat = callPackage ../applications/networking/vnstat { };