From 36da32ff33f8ec73bd2ca70bbe16b2d533b93821 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Fri, 30 Apr 2021 15:56:23 +0200
Subject: [PATCH] Add memtest86+ override to 5.31b

The version in nixpkgs (5.01-coreboot002) does not work on nunotaba nor
sayuri (it shows all? addresses as bad).
---
 pkgs/default.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 07d6830..b549e3c 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -63,4 +63,22 @@ in
       })
     ];
   });
+
+  # adapted from https://github.com/NixOS/nixpkgs/pull/85790
+  # TODO: Remove when memtest86+ ≥ 5.31b is in nixpkgs
+  memtest86plus = super.memtest86plus.overrideAttrs (o: o // rec {
+    version = "5.31b";
+
+    src = super.fetchurl {
+      url = "https://www.memtest.org/download/${version}/memtest86+-${version}.tar.gz";
+      sha256 = "028zrch87ggajlb5xx1c2ab85ggl9qldpibf45735sy0haqzyiki";
+    };
+
+    NIX_CFLAGS_COMPILE = null;
+
+    buildFlags = [ ];
+
+    doCheck = super.stdenv.isi686;
+    checkTarget = "run_self_test";
+  });
 }