diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2023-12-31 02:31:32 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2023-12-31 02:31:32 +0100 |
commit | 80020c7db424d64d352babc390bbf14e0aceaf23 (patch) | |
tree | f0fe36ea8af3f42d03d28a2865eeaf763b05fb2f /pkgs/development/libraries/jellyfin-ffmpeg | |
parent | f50aae4fb10dd51bd6ffcce0eb96d02b608a9595 (diff) | |
parent | 55b9aa64c39d6c34b6ef878fbad405900782e998 (diff) |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/development/lua-modules/generated-packages.nix ; pkgs/development/lua-modules/overrides.nix
Diffstat (limited to 'pkgs/development/libraries/jellyfin-ffmpeg')
-rw-r--r-- | pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 5ae590c1a4548..7109a5d6dfd11 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -36,5 +36,6 @@ ffmpeg_6-full.overrideAttrs (old: rec { homepage = "https://github.com/jellyfin/jellyfin-ffmpeg"; license = licenses.gpl3; maintainers = with maintainers; [ justinas ]; + pkgConfigModules = [ "libavutil" ]; }; }) |