From 1a57d96edd156958b12782e8c8b6a374142a7248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 4 Jan 2021 17:50:29 +0100 Subject: [PATCH] efivar: fixup build on i686-linux Fixes #108375. (I built the ISO locally) I believe the report is a false positive. --- pkgs/tools/system/efivar/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index ea0ed8afcfd..afff716c249 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -39,8 +39,9 @@ stdenv.mkDerivation rec { sha256 = "1ajj11wwsvamfspq4naanvw08h63gr0g71q0dfbrrywrhc0jlmdw"; }) ]; - # We have no LTO here since commit 22284b07. + # We have no LTO here since commit 22284b07. With GCC 10 that triggers a warning. postPatch = if stdenv.isi686 then "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults" else null; + NIX_CFLAGS_COMPILE = if stdenv.isi686 then "-Wno-error=stringop-truncation" else null; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt ];