From 53a9f091f8cf9362a95c12130daa1f69ddff036c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
Date: Wed, 4 Nov 2020 00:28:56 +0100
Subject: grub2: keep default modules for extraPayloadModules

When user sets extraPayloadModules, it should be added
on top of the defaults.
---
 modules/grub2/default.nix | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules/grub2/default.nix b/modules/grub2/default.nix
index d10833476990..39fa13f73026 100644
--- a/modules/grub2/default.nix
+++ b/modules/grub2/default.nix
@@ -88,22 +88,23 @@ in {
 
     extraPayloadModules = mkOption {
       type = types.listOf types.str;
-      default = [
-        "png"
-        "gfxmenu"
-        "gfxterm_background"
-        "ls"
-        "cat"
-        "echo"
-        "linux"
-        "xfs"
-        "bsd"
-      ];
+      default = [ ];
     };
   };
 
   config = mkIf cfg.enable {
     grub2.configFile = pkgs.writeText "grub.cfg" configText;
+    grub2.extraPayloadModules = [
+      "png"
+      "gfxmenu"
+      "gfxterm_background"
+      "ls"
+      "cat"
+      "echo"
+      "linux"
+      "xfs"
+      "bsd"
+    ];
 
     corenix.extraFiles = {
       ${payloadName} = {
-- 
cgit v1.2.3