Merge commit '650a295621b27c4ebe0fa64a63fd25323e64deb3'

1 files changed, 7 insertions, 17 deletions

diff --git a/nixpkgs/pkgs/tools/misc/memtest86+/default.nix b/nixpkgs/pkgs/tools/misc/memtest86+/default.nix
index 7bebc26d7ec2..b1d1971c75c7 100644
--- a/nixpkgs/pkgs/tools/misc/memtest86+/default.nix
+++ b/nixpkgs/pkgs/tools/misc/memtest86+/default.nix
@@ -1,23 +1,15 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "memtest86+-5.01+coreboot-20180113";
+  pname = "memtest86+";
+  version = "5.01-coreboot-002";
 
   src = fetchgit {
-    url = "https://review.coreboot.org/memtest86plus";
-    rev = "5ca4eb9544e51254254d09ae6e70f93403469ec3";
-    sha256 = "08m4rjr0chhhb1whgggknz926zv9hm8bisnxqp8lffqiwhb55rgk";
+    url = "https://review.coreboot.org/memtest86plus.git";
+    rev = "v002";
+    sha256 = "0cwx20yja24bfknqh1rjb5rl2c0kwnppzsisg1dibbak0l8mxchk";
   };
 
-  preBuild = ''
-    # Really dirty hack to get Memtest to build without needing a Glibc
-    # with 32-bit libraries and headers.
-    if test "$system" = x86_64-linux; then
-        mkdir gnu
-        touch gnu/stubs-32.h
-    fi
-  '';
-
   NIX_CFLAGS_COMPILE = "-I. -std=gnu90";
 
   hardeningDisable = [ "all" ];
@@ -27,13 +19,11 @@ stdenv.mkDerivation rec {
   doCheck = false; # fails
 
   installPhase = ''
-    mkdir -p $out
-    chmod -x memtest.bin
-    cp memtest.bin $out/
+    install -Dm0444 -t $out/ memtest.bin
   '';
 
   meta = {
-    homepage = http://www.memtest.org/;
+    homepage = "http://www.memtest.org/";
     description = "A tool to detect memory errors";
     license = stdenv.lib.licenses.gpl2;
     platforms = [ "x86_64-linux" "i686-linux" ];