Unverified Commit fcf7d1b3 authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

octoprint: use headless ffmpeg by default (#499053)

parents b650fd85 26c59d4b

nixos/modules/services/misc/octoprint.nix

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ let 
  baseConfig = lib.recursiveUpdate {

    plugins.curalegacy.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine";

    server.port = cfg.port;

    webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg";

    webcam.ffmpeg = "${pkgs.ffmpeg-headless.bin}/bin/ffmpeg";

  } (lib.optionalAttrs (cfg.host != null) { server.host = cfg.host; });



  fullConfig = lib.recursiveUpdate cfg.extraConfig baseConfig;

pkgs/by-name/oc/octoprint/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ let 


            # hardcore path to ffmpeg and hide related settings

            (replaceVars ./ffmpeg-path.patch {

              ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg";

              ffmpeg = "${pkgs.ffmpeg-headless}/bin/ffmpeg";

            })

          ];