mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-28 02:40:50 +00:00
nixos/octoprint: fix setting host causing port to be unset
This was because of the non-recursive update of the attrset.
This commit is contained in:
@@ -8,11 +8,11 @@ let
|
||||
|
||||
cfg = config.services.octoprint;
|
||||
|
||||
baseConfig = {
|
||||
baseConfig = lib.recursiveUpdate {
|
||||
plugins.curalegacy.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine";
|
||||
server.port = cfg.port;
|
||||
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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user