diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-08 18:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-08 18:01:24 +0000 |
| commit | f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c (patch) | |
| tree | 72f48cbc6b62cbb38c847d268cbff1d5782c4a93 /pkgs/tools/system | |
| parent | 40b71c3159786e26785d0fbda27f0e2042c7f764 (diff) | |
| parent | 159ed1e4f00b1a4dfe06881f27cb7d3ffe7d3ec3 (diff) | |
| download | nixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.tar nixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.tar.gz nixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.tar.bz2 nixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.tar.lz nixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.tar.xz nixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.tar.zst nixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/efibootmgr/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/system/efivar/default.nix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 0c678dd9c51..fd7eceede15 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { sha256 = "1sbijvlpv4khkix3vix9mbhzffj8lp8zpnbxm9gnzjz8yssz9p5h"; }) ]; - # We have no LTO here since commit 22284b07. - postPatch = if stdenv.isi686 then "sed '/^CFLAGS/s/-flto//' -i Make.defaults" else null; makeFlags = [ "EFIDIR=nixos" "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" ]; diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index c92b28e7f5e..ed831c5ecf6 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -39,9 +39,11 @@ stdenv.mkDerivation rec { sha256 = "1ajj11wwsvamfspq4naanvw08h63gr0g71q0dfbrrywrhc0jlmdw"; }) ]; - # We have no LTO here since commit 22284b07. With GCC 10 that triggers a warning. - postPatch = "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults"; - NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; + + NIX_CFLAGS_COMPILE = [ + "-Wno-error=stringop-truncation" + "-flto-partition=none" + ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ popt ]; |