mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-12 16:53:21 +00:00
Merge pull request #137371 from trofi/fix-trustedGrub
trustedGrub, trustedGrub-for-HP: apply upstream fix for fresh glibc
This commit is contained in:
commit
9c31db4f2d
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
|
||||
{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python, autoconf, automake
|
||||
, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2
|
||||
, for_HP_laptop ? false
|
||||
}:
|
||||
@ -81,7 +81,14 @@ stdenv.mkDerivation rec {
|
||||
-e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
|
||||
'';
|
||||
|
||||
patches = [ ./fix-bash-completion.patch ];
|
||||
patches = [
|
||||
./fix-bash-completion.patch
|
||||
(fetchpatch {
|
||||
# glibc-2.26 and above needs '<sys/sysmacros.h>'
|
||||
url = "https://github.com/Rohde-Schwarz/TrustedGRUB2/commit/7a5b301e3adb8e054288518a325135a1883c1c6c.patch";
|
||||
sha256 = "1jfrrmcrd9a8w7n419kszxgbpshx7888wc05smg5q4jvc1ag3xm7";
|
||||
})
|
||||
];
|
||||
|
||||
# save target that grub is compiled for
|
||||
grubTarget = if inPCSystems
|
||||
@ -89,7 +96,9 @@ stdenv.mkDerivation rec {
|
||||
else "";
|
||||
|
||||
doCheck = false;
|
||||
enableParallelBuilding = true;
|
||||
# On -j16 races with early header creation:
|
||||
# config.h:38:10: fatal error: ./config-util.h: No such file or directory
|
||||
enableParallelBuilding = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)";
|
||||
|
Loading…
Reference in New Issue
Block a user