diff options
author | Milan Pässler <milan@petabyte.dev> | 2020-11-03 16:23:44 +0100 |
---|---|---|
committer | Milan Pässler <milan@petabyte.dev> | 2020-11-03 16:23:44 +0100 |
commit | 237b7bfd767b8a058d4f5bdaf42723ab4628464d (patch) | |
tree | 92a936984a1f58654b71dc3e57416bccc8da8c15 | |
parent | 2a01eb6a8a1b617c53e6b7b9350197c81ca0fb36 (diff) |
grub2: add extraPayloadModules option
-rw-r--r-- | modules/grub2/default.nix | 19 | ||||
-rw-r--r-- | pkgs/coreboot-payload-grub2/default.nix | 12 |
2 files changed, 19 insertions, 12 deletions
diff --git a/modules/grub2/default.nix b/modules/grub2/default.nix index 08ddd1785ddd..d10833476990 100644 --- a/modules/grub2/default.nix +++ b/modules/grub2/default.nix @@ -85,6 +85,21 @@ in { type = types.package; default = pkgs.coreboot-payload-grub2; }; + + extraPayloadModules = mkOption { + type = types.listOf types.str; + default = [ + "png" + "gfxmenu" + "gfxterm_background" + "ls" + "cat" + "echo" + "linux" + "xfs" + "bsd" + ]; + }; }; config = mkIf cfg.enable { @@ -93,7 +108,9 @@ in { corenix.extraFiles = { ${payloadName} = { type = "payload"; - src = "${cfg.package}/default_payload.elf"; + src = "${ + cfg.package.override { inherit (cfg) extraPayloadModules; } + }/default_payload.elf"; }; "font.pf2".src = (pkgs.runCommand "font.pf2" { buildInputs = with pkgs; [ grub2 ]; } diff --git a/pkgs/coreboot-payload-grub2/default.nix b/pkgs/coreboot-payload-grub2/default.nix index 120afaa12036..958872cd4cdc 100644 --- a/pkgs/coreboot-payload-grub2/default.nix +++ b/pkgs/coreboot-payload-grub2/default.nix @@ -1,14 +1,4 @@ -{ grub2, lib, extraPayloadModules ? [ - "png" - "gfxmenu" - "gfxterm_background" - "ls" - "cat" - "echo" - "linux" - "xfs" - "bsd" -] }: +{ grub2, lib, extraPayloadModules ? [ ] }: grub2.overrideAttrs (oA: { pname = "coreboot-payload-${oA.pname}"; |