diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-06-13 12:31:01 +1000 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-06-16 18:23:14 -0700 |
| commit | 78e324d2726127828a15f87a75b4d3199a8955ec (patch) | |
| tree | 98f941c481d296b5215b8d8162ae720a640d2df6 /pkgs/applications/video | |
| parent | 0a63b5ae34c29f6c50db4acc0c11ebb6058372c7 (diff) | |
treewide: ffmpeg_4 -> ffmpeg
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/video/wf-recorder/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 51d284f277a15..697a468f89083 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,6 +1,6 @@ { config, stdenv, fetchurl, fetchFromGitHub, fetchpatch , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which -, ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs +, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null , CoreFoundation, Cocoa, CoreAudio, MediaPlayer @@ -155,7 +155,7 @@ in stdenv.mkDerivation rec { ++ optional swiftSupport swift; buildInputs = [ - ffmpeg_4 freetype libass libpthreadstubs + ffmpeg freetype libass libpthreadstubs luaEnv libuchardet mujs ] ++ optional alsaSupport alsaLib ++ optional archiveSupport libarchive diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index cb97e5b1090be..09b67149f5a93 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc -, wayland-protocols, ffmpeg_4, x264, libpulseaudio, ocl-icd, opencl-headers +, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; buildInputs = [ - wayland-protocols ffmpeg_4 x264 libpulseaudio ocl-icd opencl-headers + wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers ]; meta = with stdenv.lib; { |