From 26c59d4b2a85b12041341f1ca258e8174eb5d905 Mon Sep 17 00:00:00 2001 From: Lach Date: Wed, 25 Jun 2025 21:20:39 +0200 Subject: [PATCH] octoprint: use headless ffmpeg by default --- nixos/modules/services/misc/octoprint.nix | 2 +- pkgs/by-name/oc/octoprint/package.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 0343b2376d21..bf5cf47c9d0a 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -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; diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix index 862f77ab649a..cc85ad38a780 100644 --- a/pkgs/by-name/oc/octoprint/package.nix +++ b/pkgs/by-name/oc/octoprint/package.nix @@ -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"; }) ];