diff options
author | Milan Pässler <milan@petabyte.dev> | 2020-10-10 17:27:33 +0200 |
---|---|---|
committer | Milan Pässler <milan@petabyte.dev> | 2020-10-10 17:27:33 +0200 |
commit | 71f58551d83977397c3e6de795c31871c22d4d21 (patch) | |
tree | 98a136295bf343b6df654793f626faea12e3d313 /modules | |
parent | bf204327ed2435251e99520a42854c42b03434ea (diff) |
.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/coreboot/default.nix | 11 | ||||
-rw-r--r-- | modules/grub2/default.nix | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/modules/coreboot/default.nix b/modules/coreboot/default.nix index 45706be546ea..a4ae0f675c3f 100644 --- a/modules/coreboot/default.nix +++ b/modules/coreboot/default.nix @@ -11,6 +11,7 @@ let }; type = mkOption { type = types.str; + default = "raw"; }; }; in { @@ -34,13 +35,13 @@ in { }; filteredFiles = filterAttrs (k: v: v != null) cfg.extraFiles; - filesList = mapAttrsToList (k: v: v // { name = v; }) filteredFiles; + filesList = mapAttrsToList (k: v: v // { name = k; }) filteredFiles; installCommands = concatMapStringsSep "\n" (file: '' - cbfstool $out add \ - -f ${file.src} \ - -n ${file.name} \ - -t ${file.type} + cbfstool $out/coreboot.rom add \ + -f "${file.src}" \ + -n "${file.name}" \ + -t "${file.type}" '') filesList; in pkgs.runCommand "coreboot-rom" { diff --git a/modules/grub2/default.nix b/modules/grub2/default.nix index 84aae528f828..c1993f2ea518 100644 --- a/modules/grub2/default.nix +++ b/modules/grub2/default.nix @@ -12,9 +12,12 @@ in { config = lib.mkIf cfg.enable { coreboot.extraFiles = { "fallback/payload" = { - type = "payload"; + type = "simple elf"; src = "${pkgs.coreboot-payload-grub2}/default_payload.elf"; }; + "grub.cfg" = { + src = ../../grub.cfg; + }; }; }; } |