Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4445bb7284f4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1a57d96edd15
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 4, 2021

  1. efivar: fixup build on i686-linux 

    Fixes #108375.  (I built the ISO locally)
I believe the report is a false positive.
    @vcunat
    vcunat committed Jan 4, 2021
    1
    Copy the full SHA
    1a57d96 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/tools/system/efivar/default.nix
3 changes: 2 additions & 1 deletion pkgs/tools/system/efivar/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];