Merge pull request #97339 from petabyteboy/feature/aarch64-flashrom

flashrom: fix aarch64 build
This commit is contained in:
WORLDofPEACE 2020-09-08 19:58:15 -04:00 committed by GitHub
commit 6aeccf3bcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions

View File

@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71"; sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71";
}; };
mesonFlags = lib.optional stdenv.isAarch64 [ "-Dpciutils=false" ];
nativeBuildInputs = [ meson pkgconfig ninja ]; nativeBuildInputs = [ meson pkgconfig ninja ];
buildInputs = [ libftdi1 libusb1 pciutils ]; buildInputs = [ libftdi1 libusb1 pciutils ];
@ -27,7 +28,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ funfunctor fpletz ]; maintainers = with maintainers; [ funfunctor fpletz ];
platforms = platforms.all; platforms = platforms.all;
# https://github.com/flashrom/flashrom/issues/125
badPlatforms = [ "aarch64-linux" ];
}; };
} }