about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMathijs Kwik <mathijs@bluescreen303.nl>2013-12-23 10:51:22 +0100
committerMathijs Kwik <mathijs@bluescreen303.nl>2013-12-23 11:03:15 +0100
commit2f166b3a3c5648fb1984718f334c210983221ab9 (patch)
tree1e341e84b0c92df9a84e3eab81e34bc36119f203 /pkgs/top-level
parentf7500f9571aa16fb2c6c94d96d8b834fde0a2a23 (diff)
vlc: use default/latest ffmpeg
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 208b9119a4630..5e6a14c2adf29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9112,9 +9112,7 @@ let
     inherit (xlibs) libX11;
   };
 
-  vlc = callPackage ../applications/video/vlc {
-    ffmpeg = ffmpeg_1;
-  };
+  vlc = callPackage ../applications/video/vlc { };
 
   vnstat = callPackage ../applications/networking/vnstat { };