Revert "nixos/frigate: provide ffmpeg-full for nvidia hw accel"

With https://github.com/NixOS/nixpkgs/pull/354952, the regular ffmpeg-headless
should now have all the deps required for frigate to make use of hardware
acceleration on all hardware.

This is progress towards https://github.com/NixOS/nixpkgs/issues/271863

This reverts commit 7e33e470df.

This may be surprising as it's quite soon after
7e33e470df was merged but we decided in
https://github.com/NixOS/nixpkgs/pull/357717#discussion_r1853840512 to merge it
quickly to unbreak master and backport to 24.11. Non-full ffmpeg can be pursued
in master using a simple revert which is where we are now.
This commit is contained in:
Atemu
2024-11-23 13:43:38 +01:00
parent 591ebd39fb
commit 498ca4d86f
+1 -6
View File
@@ -13,7 +13,6 @@ let
filterAttrsRecursive
hasPrefix
makeLibraryPath
match
mkDefault
mkEnableOption
mkPackageOption
@@ -108,10 +107,6 @@ let
withCoralUSB = any (d: d.type == "edgetpu" && hasPrefix "usb" d.device or "") detectors;
withCoralPCI = any (d: d.type == "edgetpu" && hasPrefix "pci" d.device or "") detectors;
withCoral = withCoralPCI || withCoralUSB;
# Provide ffmpeg-full for NVIDIA hardware acceleration
ffmpegArgs = cfg.settings.ffmpeg.hwaccel_args or "";
ffmpeg' = if match "/nvidia/" ffmpegArgs != null then pkgs.ffmpeg-full else pkgs.ffmpeg-headless;
in
{
@@ -571,7 +566,7 @@ in
path = with pkgs; [
# unfree:
# config.boot.kernelPackages.nvidiaPackages.latest.bin
ffmpeg'
ffmpeg-headless
libva-utils
procps
radeontop