From 3bf810a750983d8d5fc36e7cb25df60891eb3a55 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 25 Aug 2022 08:30:29 +0100 Subject: [PATCH] honggfuzz: pin to binutils-2.38 until upstream ports to 2.39 Without the change build fails on binutils-2.39 branch as: linux/bfd.c: In function 'arch_bfdDisasm': linux/bfd.c:231:5: error: too few arguments to function 'init_disassemble_info' 231 | init_disassemble_info(&info, instr, arch_bfdFPrintF); | ^~~~~~~~~~~~~~~~~~~~~ --- pkgs/tools/security/honggfuzz/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index 300e41750bab..5d709a4441d3 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper, clang, llvm, libbfd -, libopcodes, libunwind, libblocksruntime }: +{ lib +, stdenv +, fetchFromGitHub +, callPackage +, makeWrapper +, clang +, llvm +# TODO: switch to latest versions when 2.6 release is out to include +# https://github.com/google/honggfuzz/commit/90fdf81006614664ef05e5e3c6f94d91610f11b2 +, libbfd_2_38, libopcodes_2_38 +, libunwind +, libblocksruntime }: stdenv.mkDerivation rec { pname = "honggfuzz"; @@ -21,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ llvm ]; - propagatedBuildInputs = [ libbfd libopcodes libunwind libblocksruntime ]; + propagatedBuildInputs = [ libbfd_2_38 libopcodes_2_38 libunwind libblocksruntime ]; makeFlags = [ "PREFIX=$(out)" ];