From 48a6b898ae80cc62dc15a481fb49f947dd2eb9f6 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 26 Nov 2025 22:16:28 -0800
Subject: [PATCH] nixos/grub: use new combined memtest86plus binary

memtest86plus puts the path to the binary at a passthru attr

after memtest86plus 8 there's a single combined EFI+legacy file
---
 nixos/modules/system/boot/loader/grub/grub.nix    | 2 +-
 nixos/modules/system/boot/loader/grub/memtest.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index c18d5431bd8a..042fd63cd254 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -472,7 +472,7 @@ in
         type = types.attrsOf types.path;
         default = { };
         example = literalExpression ''
-          { "memtest.bin" = "''${pkgs.memtest86plus}/memtest.bin"; }
+          { "memtest.bin" = pkgs.memtest86plus.efi; }
         '';
         description = ''
           A set of files to be copied to {file}`/boot`.
diff --git a/nixos/modules/system/boot/loader/grub/memtest.nix b/nixos/modules/system/boot/loader/grub/memtest.nix
index b762a7b6ce46..fb3db9ee31cb 100644
--- a/nixos/modules/system/boot/loader/grub/memtest.nix
+++ b/nixos/modules/system/boot/loader/grub/memtest.nix
@@ -69,6 +69,6 @@ in
         linux @bootRoot@/memtest.bin ${toString cfg.params}
       }
     '';
-    boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin";
+    boot.loader.grub.extraFiles."memtest.bin" = memtest86.efi;
   };
 }