Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

elf-dissector: unstable-2020-11-14 -> unstable-2023-06-06

rewine c55163f4 aceeceaf

+34 -7
+21 -7
pkgs/applications/misc/elf-dissector/default.nix
··· 1 - { mkDerivation, fetchgit, lib, cmake, extra-cmake-modules, kitemmodels 2 - , libiberty, libelf, libdwarf, libopcodes }: 1 + { lib 2 + , stdenv 3 + , fetchgit 4 + , cmake 5 + , extra-cmake-modules 6 + , wrapQtAppsHook 7 + , kitemmodels 8 + , libiberty 9 + , libelf 10 + , libdwarf 11 + , libopcodes 12 + }: 3 13 4 - mkDerivation rec { 14 + stdenv.mkDerivation rec { 5 15 pname = "elf-dissector"; 6 - version = "unstable-2020-11-14"; 16 + version = "unstable-2023-06-06"; 7 17 8 18 src = fetchgit { 9 19 url = "https://invent.kde.org/sdk/elf-dissector.git"; 10 - rev = "d1700e76e3f60aff0a2a9fb63bc001251d2be522"; 11 - sha256 = "1h1xr3ag1sbf005drcx8g8dc5mk7fb2ybs73swrld7clcawhxnk8"; 20 + rev = "de2e80438176b4b513150805238f3333f660718c"; 21 + hash = "sha256-2yHPVPu6cncXhFCJvrSodcRFVAxj4vn+e99WhtiZniM="; 12 22 }; 13 23 14 - nativeBuildInputs = [ cmake extra-cmake-modules ]; 24 + patches = [ 25 + ./fix_build_for_src_lib_disassembler_disassembler.diff 26 + ]; 27 + 28 + nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; 15 29 16 30 buildInputs = [ kitemmodels libiberty libelf libdwarf libopcodes ]; 17 31
+13
pkgs/applications/misc/elf-dissector/fix_build_for_src_lib_disassembler_disassembler.diff
··· 1 + diff --git a/src/lib/disassmbler/disassembler.cpp b/src/lib/disassmbler/disassembler.cpp 2 + index 3277544..e77ffc4 100644 3 + --- a/src/lib/disassmbler/disassembler.cpp 4 + +++ b/src/lib/disassmbler/disassembler.cpp 5 + @@ -127,7 +127,7 @@ QString Disassembler::disassembleBinutils(const unsigned char* data, uint64_t si 6 + QString result; 7 + disassembler_ftype disassemble_fn; 8 + disassemble_info info; 9 + - INIT_DISASSEMBLE_INFO(info, &result, qstring_printf); 10 + + INIT_DISASSEMBLE_INFO(info, &result, qstring_printf, qstring_printf); 11 + 12 + info.application_data = this; 13 + info.flavour = bfd_target_elf_flavour;