Skip to content

Commit

Permalink
Revert "nixos/frigate: provide ffmpeg-full for nvidia hw accel"
Browse files Browse the repository at this point in the history
With NixOS#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 NixOS#271863

This reverts commit 7e33e47.

This may be surprising as it's quite soon after
7e33e47 was merged but we decided in
NixOS#357717 (comment) 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.
  • Loading branch information
Atemu committed Nov 23, 2024
1 parent 591ebd3 commit 498ca4d
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions nixos/modules/services/video/frigate.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ let
filterAttrsRecursive
hasPrefix
makeLibraryPath
match
mkDefault
mkEnableOption
mkPackageOption
Expand Down Expand Up @@ -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

{
Expand Down Expand Up @@ -571,7 +566,7 @@ in
path = with pkgs; [
# unfree:
# config.boot.kernelPackages.nvidiaPackages.latest.bin
ffmpeg'
ffmpeg-headless
libva-utils
procps
radeontop
Expand Down

0 comments on commit 498ca4d

Please sign in to comment.