diff options
author | Piotr Bogdan <ppbogdan@gmail.com> | 2018-11-11 01:22:40 +0000 |
---|---|---|
committer | Piotr Bogdan <ppbogdan@gmail.com> | 2019-01-27 00:40:01 +0000 |
commit | f8d0626890cab9bf47e106d0bb9638b4c853759b (patch) | |
tree | 45056e16ef0a38eca73d903bd277a3e4419d3864 /pkgs/top-level/all-packages.nix | |
parent | 22d92d62457daa2bf1db856506b0dc6d7682087c (diff) | |
download | nixlib-f8d0626890cab9bf47e106d0bb9638b4c853759b.tar nixlib-f8d0626890cab9bf47e106d0bb9638b4c853759b.tar.gz nixlib-f8d0626890cab9bf47e106d0bb9638b4c853759b.tar.bz2 nixlib-f8d0626890cab9bf47e106d0bb9638b4c853759b.tar.lz nixlib-f8d0626890cab9bf47e106d0bb9638b4c853759b.tar.xz nixlib-f8d0626890cab9bf47e106d0bb9638b4c853759b.tar.zst nixlib-f8d0626890cab9bf47e106d0bb9638b4c853759b.zip |
livepeer: ffmpeg_3 is the current default so don't override
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c7c70d6257d..686622ae62db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13645,7 +13645,7 @@ in lighttpd = callPackage ../servers/http/lighttpd { }; - livepeer = callPackage ../servers/livepeer { ffmpeg = ffmpeg_3; }; + livepeer = callPackage ../servers/livepeer { }; lwan = callPackage ../servers/http/lwan { }; |