Fix Dhall escaping in nixos-modules/hardware
This commit is contained in:
parent
ce08351d4d
commit
d75e71973e
|
@ -30,30 +30,24 @@ in {
|
||||||
usb_host_drv = cfg.usb.host.package;
|
usb_host_drv = cfg.usb.host.package;
|
||||||
};
|
};
|
||||||
|
|
||||||
ahciConfig = with cfg.ahci;
|
ahciConfig = lib.optionalString cfg.ahci.enable (with cfg.ahci; ''
|
||||||
lib.optionalString enable ''
|
, ahci_drv = Some {
|
||||||
, ahci_drv = Some ${
|
, binary = ${ahciEris.cap}
|
||||||
toDhall {
|
, atapi = ${toDhall atapiSupport}
|
||||||
binary = ahciEris.cap;
|
|
||||||
atapi = atapiSupport;
|
|
||||||
}
|
}
|
||||||
}
|
'');
|
||||||
'';
|
|
||||||
|
|
||||||
usbConfig = lib.optionalString cfg.usb.enable ''
|
usbConfig = lib.optionalString cfg.usb.enable (with cfg.usb.host; ''
|
||||||
, usb_block_drv = Some { binary = ${usbEris.usb_block_drv.cap} }
|
, usb_block_drv = Some { binary = ${usbEris.usb_block_drv.cap} }
|
||||||
, usb_host_drv = Some ${
|
, usb_host_drv = Some {
|
||||||
with cfg.usb.host;
|
, binary = ${usbEris.usb_host_drv.cap}
|
||||||
toDhall {
|
, bios_handoff = ${toDhall biosHandoff}
|
||||||
binary = usbEris.usb_host_drv.cap;
|
, ehci = ${toDhall ehciSupport}
|
||||||
bios_handoff = biosHandoff;
|
, ohci = ${toDhall ohciSupport}
|
||||||
ehci = ehciSupport;
|
, uhci = ${toDhall uhciSupport}
|
||||||
ohci = ohciSupport;
|
, xhci = ${toDhall xhciSupport}
|
||||||
uhci = uhciSupport;
|
|
||||||
xhci = xhciSupport;
|
|
||||||
}
|
}
|
||||||
}
|
'');
|
||||||
'';
|
|
||||||
|
|
||||||
managerConfig = pkgs.writeText "device_manager.dhall" ''
|
managerConfig = pkgs.writeText "device_manager.dhall" ''
|
||||||
let Manager = ${pkgs.genodePackages.device_manager.dhall}/package.dhall
|
let Manager = ${pkgs.genodePackages.device_manager.dhall}/package.dhall
|
||||||
|
|
Loading…
Reference in New Issue