summary refs log tree commit diff
path: root/pkgs/tools/system
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2021-01-04 20:51:32 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2021-01-04 20:51:32 +0100
commitb20838eb4a04560dfe4bd7d2fae42a9ad54dba0f (patch)
tree8cba229fb569673431d1f0ac465a2320bb8dfe79 /pkgs/tools/system
parent507efdb11fcdbf59199b2fe4717d6799ff623a2a (diff)
parent59ede499ae7f0355df96e954697a4df119342775 (diff)
downloadnixpkgs-b20838eb4a04560dfe4bd7d2fae42a9ad54dba0f.tar
nixpkgs-b20838eb4a04560dfe4bd7d2fae42a9ad54dba0f.tar.gz
nixpkgs-b20838eb4a04560dfe4bd7d2fae42a9ad54dba0f.tar.bz2
nixpkgs-b20838eb4a04560dfe4bd7d2fae42a9ad54dba0f.tar.lz
nixpkgs-b20838eb4a04560dfe4bd7d2fae42a9ad54dba0f.tar.xz
nixpkgs-b20838eb4a04560dfe4bd7d2fae42a9ad54dba0f.tar.zst
nixpkgs-b20838eb4a04560dfe4bd7d2fae42a9ad54dba0f.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r--pkgs/tools/system/efivar/default.nix3
1 files changed, 2 insertions, 1 deletions
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 ];