From 0c8284fbf6642e3b30a2d06d2d1a16659d2b075a Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Mon, 21 Dec 2020 13:54:02 +0100
Subject: [PATCH] nixos: add nova artifacts to boot.loader.grub.extraFiles

---
 nixos-modules/nova.nix | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/nixos-modules/nova.nix b/nixos-modules/nova.nix
index caa30e9..376da34 100644
--- a/nixos-modules/nova.nix
+++ b/nixos-modules/nova.nix
@@ -39,20 +39,29 @@ in {
       "-initrd '${pkgs.genodePackages.NOVA}/hypervisor-x86_64 arg=iommu logmem novpid serial,${config.genode.boot.image}/image.elf'"
     ];
 
-  virtualisation.qemu.kernel = "${pkgs.genodePackages.bender}/share/bender/bender";
+  virtualisation.qemu.kernel =
+    "${pkgs.genodePackages.bender}/share/bender/bender";
 
   virtualisation.qemu.initrd = "${pkgs.genodePackages.NOVA}/hypervisor-x86_64";
 
-  virtualisation.qemu.cmdline = "arg=iommu logmem novpid serial,${config.genode.boot.image}/image.elf";
+  virtualisation.qemu.cmdline =
+    "arg=iommu logmem novpid serial,${config.genode.boot.image}/image.elf";
 
-  boot.loader.grub.extraEntries = ''
-    menuentry 'Genode on NOVA' {
-      insmod multiboot2
-      insmod gzio
-      multiboot2 ${bootDir}/bender.gz serial_fallback
-      module2 ${bootDir}/hypervisor.gz hypervisor iommu logmem novga novpid serial
-      module2 ${bootDir}/image.elf.gz image.elf
-    }
-  '';
+  boot.loader.grub = {
+    extraEntries = ''
+      menuentry 'Genode on NOVA' {
+        insmod multiboot2
+        insmod gzio
+        multiboot2 ${bootDir}/bender.gz serial_fallback
+        module2 ${bootDir}/hypervisor.gz hypervisor iommu logmem novga novpid serial
+        module2 ${bootDir}/image.elf.gz image.elf
+      }
+    '';
+    extraFiles = {
+      "bender.gz" = bootDir + "/bender.gz";
+      "hypervisor.gz" = bootDir + "/hypervisor.gz";
+      "image.elf.gz" = bootDir + "/image.elf.gz";
+    };
+  };
 
 }