diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-03 00:02:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-03 00:02:23 +0000 |
| commit | 75a11d85b89dd3d74ffacc7f6900e0c189c5cb95 (patch) | |
| tree | 393babe34b5e478fe5f6ff18f5f06fe8c72283e6 /pkgs/applications/video | |
| parent | b1b0b6e3e76960d83239fc293cf5902adb01a91d (diff) | |
| parent | 529fd47f28707310775d5ddcc5763740e2feed01 (diff) | |
| download | nixpkgs-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar nixpkgs-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.gz nixpkgs-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.bz2 nixpkgs-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.lz nixpkgs-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.xz nixpkgs-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.zst nixpkgs-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 057b9874162..8290e39979c 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -9,7 +9,7 @@ , ninja , pkg-config , python3 -, ffmpeg_5 +, ffmpeg , freefont_ttf , freetype , libass @@ -159,7 +159,7 @@ in stdenv'.mkDerivation (finalAttrs: { ++ lib.optionals waylandSupport [ wayland-scanner ]; buildInputs = [ - ffmpeg_5 + ffmpeg freetype libass libpthreadstubs |