public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memtest86+: use debian patches, use default gcc

Browse Source
This commit is contained in:
Jan Malakhovski
2017-08-29 11:08:06 +00:00
parent f54018cee8
commit 358604aae2
5 changed files with 23 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/memtest86+/default.nix
+22 -2
View File
@@ -8,8 +8,28 @@ stdenv.mkDerivation rec {
sha256 = "0fch1l55753y6jkk0hj8f6vw4h1kinkn9ysp22dq5g9zjnvjf88l";
};
# Patch incompatiblity with GCC. Source: http://koji.fedoraproject.org/koji/buildinfo?buildID=586907
patches = [ ./compile-fix.patch ./crash-fix.patch ./no-optimization.patch ];
patches = [
(fetchurl {
url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/doc-serialconsole";
sha256 = "1qh2byj9bmpchym8iq20n4hqmy10nrl6bi0d9pgdqikkmw9m38jq";
})
(fetchurl {
url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/multiboot";
sha256 = "0nq61307ah5b41ff5nqs99wjzjzlajvfv6k9c9d0gqvhx8r4dvmy";
})
(fetchurl {
url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/memtest86+-5.01-O0.patch";
sha256 = "1xmj3anq1fr0cxwv8lqfp5cr5f58v7glwc6z0v8hx8aib8yj1wl2";
})
(fetchurl {
url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/memtest86+-5.01-array-size.patch";
sha256 = "0yxlzpfs6313s91y984p7rlf5rgybcjhg7i9zqy4wqhm3j90f1kb";
})
(fetchurl {
url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/gcc-5";
sha256 = "13xfy6sn8qbj1hx4vms2cz24dsa3bl8n2iblz185hkn11y7141sc";
})
];
preBuild = ''
# Really dirty hack to get Memtest to build without needing a Glibc