mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-11 12:15:34 +03:00
nixos/octoprint: fix setting host causing port to be unset (#411942)
This commit is contained in:
commit
27f051c104
1 changed files with 2 additions and 2 deletions
|
@ -8,11 +8,11 @@ let
|
||||||
|
|
||||||
cfg = config.services.octoprint;
|
cfg = config.services.octoprint;
|
||||||
|
|
||||||
baseConfig = {
|
baseConfig = lib.recursiveUpdate {
|
||||||
plugins.curalegacy.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine";
|
plugins.curalegacy.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine";
|
||||||
server.port = cfg.port;
|
server.port = cfg.port;
|
||||||
webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg";
|
webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg";
|
||||||
} // lib.optionalAttrs (cfg.host != null) { server.host = cfg.host; };
|
} (lib.optionalAttrs (cfg.host != null) { server.host = cfg.host; });
|
||||||
|
|
||||||
fullConfig = lib.recursiveUpdate cfg.extraConfig baseConfig;
|
fullConfig = lib.recursiveUpdate cfg.extraConfig baseConfig;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue