commit 6c4b1800989fcd82bca51f7ba8a72439cfe84c3c · pyrox.dev/nixpkgs

+11

nixos/modules/services/video/frigate.nix

···

       231
       231
        
                   };

     

       232
       232
        
                 };

     

       233
       233
        
       

     

       234
       234
       +
                 ffmpeg = {

     

       235
       235
       +
                   path = mkOption {

     

       236
       236
       +
                     type = coercedTo package toString str;

     

       237
       237
       +
                     default = pkgs.ffmpeg-headless;

     

       238
       238
       +
                     example = literalExpression "pkgs.ffmpeg-full";

     

       239
       239
       +
                     description = ''

     

       240
       240
       +
                       Package providing the ffmpeg and ffprobe executables below the bin/ directory.

     

       241
       241
       +
                     '';

     

       242
       242
       +
                   };

     

       243
       243
       +
                 };

     

       244
       244
       +
       

     

       234
       245
        
                 mqtt = {

     

       235
       246
        
                   enabled = mkEnableOption "MQTT support";

     

       236
       247

+21 -13

pkgs/by-name/fr/frigate/ffmpeg.patch

···

       1
       1
        
       diff --git a/frigate/config/camera/ffmpeg.py b/frigate/config/camera/ffmpeg.py

     

       2
       2
       -
       index 04bbfac7..4390a571 100644

     

       2
       2
       +
       index 04bbfac7..396bcc4b 100644

     

       3
       3
        
       --- a/frigate/config/camera/ffmpeg.py

     

       4
       4
        
       +++ b/frigate/config/camera/ffmpeg.py

     

       5
       5
       -
       @@ -70,18 +70,14 @@ class FfmpegConfig(FrigateBaseModel):

     

       5
       5
       +
       @@ -1,4 +1,5 @@

     

       6
       6
       +
        from enum import Enum

     

       7
       7
       +
       +from os.path import join

     

       8
       8
       +
        from typing import Union

     

       9
       9
       +
        

     

       10
       10
       +
        from pydantic import Field, field_validator

     

       11
       11
       +
       @@ -69,21 +70,11 @@ class FfmpegConfig(FrigateBaseModel):

     

       12
       12
       +
        

     

       6
       13
        
            @property

     

       7
       14
        
            def ffmpeg_path(self) -> str:

     

       8
       8
       -
                if self.path == "default":

     

       15
       15
       +
       -        if self.path == "default":

     

       9
       16
        
       -            return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg"

     

       10
       17
        
       -        elif self.path in INCLUDED_FFMPEG_VERSIONS:

     

       11
       18
        
       -            return f"/usr/lib/ffmpeg/{self.path}/bin/ffmpeg"

     

       12
       12
       -
       +            return "@ffmpeg@"

     

       13
       13
       -
                else:

     

       14
       14
       -
                    return f"{self.path}/bin/ffmpeg"

     

       19
       19
       +
       -        else:

     

       20
       20
       +
       -            return f"{self.path}/bin/ffmpeg"

     

       21
       21
       +
       +        return join(self.path, "bin/ffmpeg")

     

       15
       22
        
        

     

       16
       23
        
            @property

     

       17
       24
        
            def ffprobe_path(self) -> str:

     

       18
       18
       -
                if self.path == "default":

     

       25
       25
       +
       -        if self.path == "default":

     

       19
       26
        
       -            return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffprobe"

     

       20
       27
        
       -        elif self.path in INCLUDED_FFMPEG_VERSIONS:

     

       21
       28
        
       -            return f"/usr/lib/ffmpeg/{self.path}/bin/ffprobe"

     

       22
       22
       -
       +            return "@ffprobe@"

     

       23
       23
       -
                else:

     

       24
       24
       -
                    return f"{self.path}/bin/ffprobe"

     

       29
       29
       +
       -        else:

     

       30
       30
       +
       -            return f"{self.path}/bin/ffprobe"

     

       31
       31
       +
       +        return join(self.path, "bin/ffprobe")

     

       32
       32
       +
        

     

       25
       33
        
        

     

       34
       34
       +
        class CameraRoleEnum(str, Enum):

     

       26
       35
        
       diff --git a/frigate/record/export.py b/frigate/record/export.py

     

       27
       27
       -
       index 0d3f96da..09cadbcd 100644

     

       36
       36
       +
       index 0d3f96da..463bcff4 100644

     

       28
       37
        
       --- a/frigate/record/export.py

     

       29
       38
        
       +++ b/frigate/record/export.py

     

       30
       39
        
       @@ -126,7 +126,7 @@ class RecordingExporter(threading.Thread):

     
···

       32
       41
        
                    seconds = int(diff % 60)

     

       33
       42
        
                    ffmpeg_cmd = [

     

       34
       43
        
       -                "/usr/lib/ffmpeg/7.0/bin/ffmpeg",  # hardcode path for exports thumbnail due to missing libwebp support

     

       35
       35
       -
       +                "@ffmpeg@",  # hardcode path for exports thumbnail due to missing libwebp support

     

       44
       44
       +
       +                FfmpegConfig.ffmpeg_path,  # hardcode path for exports thumbnail due to missing libwebp support

     

       36
       45
        
                        "-hide_banner",

     

       37
       46
        
                        "-loglevel",

     

       38
       47
        
                        "warning",

     

       39
       39
       -
       ~

+2 -6

pkgs/by-name/fr/frigate/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         callPackage,

     

       5
       5
       -
         replaceVars,

     

       6
       5
        
         python312Packages,

     

       7
       6
        
         fetchFromGitHub,

     

       8
       7
        
         fetchurl,

     
···

       78
       77
        
       

     

       79
       78
        
         patches = [

     

       80
       79
        
           ./constants.patch

     

       81
       81
       -
       

     

       82
       82
       -
           (replaceVars ./ffmpeg.patch {

     

       83
       83
       -
             ffmpeg = lib.getExe ffmpeg-headless;

     

       84
       84
       -
             ffprobe = lib.getExe' ffmpeg-headless "ffprobe";

     

       85
       85
       -
           })

     

       80
       80
       +
           ./ffmpeg.patch

     

       86
       81
        
         ];

     

       87
       82
        
       

     

       88
       83
        
         postPatch = ''

     
···

       205
       200
        
         '';

     

       206
       201
        
       

     

       207
       202
        
         nativeCheckInputs = with python3Packages; [

     

       203
       203
       +
           ffmpeg-headless

     

       208
       204
        
           pytestCheckHook

     

       209
       205
        
         ];

     

       210
       206