From 2472f4eaee09d97b874f1c0bbc8a0667c4e54a56 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Tue, 9 May 2023 08:58:26 +0800 Subject: [PATCH] flashrom: unbreak darwin --- pkgs/tools/misc/flashrom/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index a76074918a66..3bd040512631 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config installShellFiles ]; - buildInputs = [ libftdi1 libusb1 pciutils ] + buildInputs = [ libftdi1 libusb1 ] + ++ lib.optional (!stdenv.isDarwin) [ pciutils ] ++ lib.optional jlinkSupport libjaylink; postPatch = '' @@ -30,7 +31,8 @@ stdenv.mkDerivation rec { ''; makeFlags = [ "PREFIX=$(out)" "libinstall" ] - ++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes"; + ++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes" + ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=no" ]; postInstall = '' install -Dm644 util/flashrom_udev.rules $out/lib/udev/rules.d/flashrom.rules @@ -42,6 +44,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ fpletz felixsinger ]; platforms = platforms.all; - broken = stdenv.isDarwin; # requires DirectHW }; }