diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2019-08-08 22:48:27 +0200 |
---|---|---|
committer | Silvan Mosberger <infinisil@icloud.com> | 2019-08-31 18:19:00 +0200 |
commit | 478e7184f88db1364cc75107036f7c4decc0cc41 (patch) | |
tree | 5ff3d3a18e3aef9af4333c392a94751333754270 /nixos/modules/system/boot/loader/raspberrypi | |
parent | 69d58ee24506e2b3b5aff347ae3b0791110340ec (diff) |
nixos/modules: Remove all usages of types.string
And replace them with a more appropriate type Also fix up some minor module problems along the way
Diffstat (limited to 'nixos/modules/system/boot/loader/raspberrypi')
-rw-r--r-- | nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index 7db60daa60b8f..1c8354e52696d 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -10,7 +10,7 @@ let builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; }; builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; }; - builder = + builder = if cfg.uboot.enable then "${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr} -c" else @@ -86,7 +86,7 @@ in firmwareConfig = mkOption { default = null; - type = types.nullOr types.string; + type = types.nullOr types.lines; description = '' Extra options that will be appended to <literal>/boot/config.txt</literal> file. For possible values, see: https://www.raspberrypi.org/documentation/configuration/config-txt/ |