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

pkgs/applications/misc/elf-dissector/default.nix

@@ -1,17 +1,31 @@
-{ mkDerivation, fetchgit, lib, cmake, extra-cmake-modules, kitemmodels
+{ lib
-, libiberty, libelf, libdwarf, libopcodes }:
+, stdenv
+, fetchgit
+, cmake
+, extra-cmake-modules
+, wrapQtAppsHook
+, kitemmodels
+, libiberty
+, libelf
+, libdwarf
+, libopcodes
+}:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "elf-dissector";
-  version = "unstable-2020-11-14";
+  version = "unstable-2023-06-06";
 
   src = fetchgit {
     url = "https://invent.kde.org/sdk/elf-dissector.git";
-    rev = "d1700e76e3f60aff0a2a9fb63bc001251d2be522";
+    rev = "de2e80438176b4b513150805238f3333f660718c";
-    sha256 = "1h1xr3ag1sbf005drcx8g8dc5mk7fb2ybs73swrld7clcawhxnk8";
+    hash = "sha256-2yHPVPu6cncXhFCJvrSodcRFVAxj4vn+e99WhtiZniM=";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules ];
+  patches = [
+    ./fix_build_for_src_lib_disassembler_disassembler.diff
+  ];
+
+  nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
 
   buildInputs = [ kitemmodels libiberty libelf libdwarf libopcodes ];
 

pkgs/applications/misc/elf-dissector/fix_build_for_src_lib_disassembler_disassembler.diff

@@ -0,0 +1,13 @@
+diff --git a/src/lib/disassmbler/disassembler.cpp b/src/lib/disassmbler/disassembler.cpp
+index 3277544..e77ffc4 100644
+--- a/src/lib/disassmbler/disassembler.cpp
++++ b/src/lib/disassmbler/disassembler.cpp
+@@ -127,7 +127,7 @@ QString Disassembler::disassembleBinutils(const unsigned char* data, uint64_t si
+     QString result;
+     disassembler_ftype disassemble_fn;
+     disassemble_info info;
+-    INIT_DISASSEMBLE_INFO(info, &result, qstring_printf);
++    INIT_DISASSEMBLE_INFO(info, &result, qstring_printf, qstring_printf);
+ 
+     info.application_data = this;
+     info.flavour = bfd_target_elf_flavour;