From 28433de6b20a6dcd66d2a0f263cef37a936039fc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 25 Aug 2022 07:59:37 +0100 Subject: [PATCH] kcov: pin to binutils-2.38 until upstream ports to 2.39 Without the change build fails on binutils-2.39 branch as: /build/source/src/parsers/bfd-disassembler.cc: In constructor 'BfdDisassembler::BfdDisassembler()': /build/source/src/parsers/bfd-disassembler.cc:78:38: error: too few arguments to function 'void init_disassemble_info(disassemble_info*, void*, fprintf_ftype, fprintf_styled_ftype)' 78 | init_disassemble_info(&m_info, (void *)this, BfdDisassembler::opcodesFprintFuncStatic); | ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- pkgs/development/tools/analysis/kcov/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index a708c88ee9ee..922524ac4d5b 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -8,7 +8,9 @@ , elfutils , python3 , libiberty -, libopcodes +# TODO: switch back to latest versions when upstream ports +# to binutils-2.39: https://github.com/SimonKagstrom/kcov/issues/381 +, libopcodes_2_38 , runCommand , gcc , rustc @@ -30,7 +32,7 @@ let preConfigure = "patchShebangs src/bin-to-c-source.py"; nativeBuildInputs = [ cmake pkg-config python3 ]; - buildInputs = [ curl zlib elfutils libiberty libopcodes ]; + buildInputs = [ curl zlib elfutils libiberty libopcodes_2_38 ]; strictDeps = true;