diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-11 18:01:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-11 18:01:16 +0000 |
| commit | c435b0e35f8b7cbea4b6d0fe9894ab80e7b641b5 (patch) | |
| tree | 513b730bff367302ebd77a18a1dbf97d4d257d9f /pkgs/tools/misc/grub | |
| parent | a8be3a74ccafe990aeb59f51fabd22b77f7c416d (diff) | |
| parent | f6e9e908ccbcabb365cb5434a4a38dd8c996fc72 (diff) | |
| download | nixpkgs-c435b0e35f8b7cbea4b6d0fe9894ab80e7b641b5.tar nixpkgs-c435b0e35f8b7cbea4b6d0fe9894ab80e7b641b5.tar.gz nixpkgs-c435b0e35f8b7cbea4b6d0fe9894ab80e7b641b5.tar.bz2 nixpkgs-c435b0e35f8b7cbea4b6d0fe9894ab80e7b641b5.tar.lz nixpkgs-c435b0e35f8b7cbea4b6d0fe9894ab80e7b641b5.tar.xz nixpkgs-c435b0e35f8b7cbea4b6d0fe9894ab80e7b641b5.tar.zst nixpkgs-c435b0e35f8b7cbea4b6d0fe9894ab80e7b641b5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc/grub')
| -rw-r--r-- | pkgs/tools/misc/grub/trusted.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index b0a8c9e1033..edb94891fbe 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -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)"; |