From b77a91bc87b0d019cba190ecdec9fb48db942c7a Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sat, 6 Feb 2021 21:11:39 +0100
Subject: [PATCH] nixos-modules: boot packages from buildPackages.buildPackages

---
 nixos-modules/genode-core.nix             | 2 +-
 nixos-modules/lib/make-bootable-image.nix | 4 ++--
 nixos-modules/qemu-vm.nix                 | 4 ++--
 overlay/default.nix                       | 6 ++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/nixos-modules/genode-core.nix b/nixos-modules/genode-core.nix
index b76bd68..ba25a0b 100644
--- a/nixos-modules/genode-core.nix
+++ b/nixos-modules/genode-core.nix
@@ -411,7 +411,7 @@ in {
     virtualisation.useBootLoader = config.genode.boot.storeBackend != "memory";
 
     virtualisation.qemu.options =
-      let blockCommon = [ "-bios ${pkgs.buildPackages.OVMF.fd}/FV/OVMF.fd" ];
+      let blockCommon = [ "-bios ${pkgs.buildPackages.buildPackages.OVMF.fd}/FV/OVMF.fd" ];
       in {
         fs = blockCommon;
         memory = [ ];
diff --git a/nixos-modules/lib/make-bootable-image.nix b/nixos-modules/lib/make-bootable-image.nix
index be56d95..9d9c260 100644
--- a/nixos-modules/lib/make-bootable-image.nix
+++ b/nixos-modules/lib/make-bootable-image.nix
@@ -4,8 +4,8 @@
 pkgs.stdenv.mkDerivation {
   name = "boot.qcow2";
 
-  nativeBuildInputs = with pkgs.buildPackages; [
-    buildPackages.qemu_test
+  nativeBuildInputs = with pkgs.buildPackages.buildPackages; [
+    qemu_test
     utillinux
     zstd
   ];
diff --git a/nixos-modules/qemu-vm.nix b/nixos-modules/qemu-vm.nix
index e4f5bcc..8cce9f7 100644
--- a/nixos-modules/qemu-vm.nix
+++ b/nixos-modules/qemu-vm.nix
@@ -12,9 +12,9 @@ let
   consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles;
 
   efiPrefix = if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
-    "${pkgs.buildPackages.OVMF.fd}/FV/OVMF"
+    "${pkgs.buildPackages.buildPackages.OVMF.fd}/FV/OVMF"
   else if pkgs.stdenv.isAarch64 then
-    "${pkgs.buildPackages.OVMF.fd}/FV/AAVMF"
+    "${pkgs.buildPackages.buildPackages.OVMF.fd}/FV/AAVMF"
   else
     throw "No EFI firmware available for platform";
   efiFirmware = "${efiPrefix}_CODE.fd";
diff --git a/overlay/default.nix b/overlay/default.nix
index d7d3e90..b0f8975 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -87,6 +87,12 @@ in nullPkgs // {
     inherit flake;
     pkgs = final;
   };
+
+  grub2 = if stdenv.targetPlatform.isGenode then
+    prev.buildPackages.grub2
+  else
+    prev.grub2;
+
   libconfig =
     overrideAttrsHost (attrs: { configureFlags = [ "--disable-examples" ]; })
     libconfig;