cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nixos/klipper: Rename firmwareConfig to configFile

Browse source
This commit is contained in:
Van Tuan Vo 2022-03-22 00:01:16 +01:00
parent 7200dc6651
commit 9271773a7b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/misc/klipper.nix
View file

@ -82,7 +82,7 @@ in
WARNING: Be careful with this option. Enabling this will automatically flash your microcontroller on e.g. nixos-rebuild.
This can potentially brick your microcontroller. Alternatively, use `klipper-flash-$mcu` to flash manually.
'';
firmwareConfig = mkOption {
configFile = mkOption {
type = path;
description = "Path to firmware config which is generated using `klipper-genconf`";
};
@ -144,10 +144,10 @@ in
with pkgs;
let
firmwares = mapAttrs
(mcu: { flashing, firmwareConfig }: pkgs.klipper-firmware.override {
(mcu: { flashing, configFile }: pkgs.klipper-firmware.override {
flashDevice = if flashing.enable then cfg.settings."${mcu}".serial else null;
mcu = lib.strings.sanitizeDerivationName mcu;
inherit firmwareConfig;
firmwareConfig = configFile;
})
cfg.firmwares;
firmwareFlasher = mapAttrsToList
@ -155,7 +155,7 @@ in
mcu = lib.strings.sanitizeDerivationName mcu;
klipper-firmware = firmware;
flashDevice = cfg.settings."${mcu}".serial;
firmwareConfig = cfg.firmwares."${mcu}".firmwareConfig;
firmwareConfig = cfg.firmwares."${mcu}".configFile;
})
firmwares;
in