octoprint: use headless ffmpeg by default (#499053)
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user