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: 9089e5aad502
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1309be91f1a0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 9, 2020

  1. flashrom: fix aarch64 build 

    (cherry-picked from commit f7e0ff0)
    Milan Pässler committed Sep 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1309be9 View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −2 pkgs/tools/misc/flashrom/default.nix
3 changes: 1 addition & 2 deletions pkgs/tools/misc/flashrom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71";
};

mesonFlags = lib.optional stdenv.isAarch64 [ "-Dpciutils=false" ];
nativeBuildInputs = [ meson pkgconfig ninja ];
buildInputs = [ libftdi1 libusb1 pciutils ];

@@ -27,7 +28,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ funfunctor fpletz ];
platforms = platforms.all;
# https://github.com/flashrom/flashrom/issues/125
badPlatforms = [ "aarch64-linux" ];
};
}