tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
0
fork
atom
overview
issues
pulls
pipelines
elf-dissector: unstable-2020-11-14 -> unstable-2023-06-06
rewine
2 years ago
c55163f4
aceeceaf
+34
-7
2 changed files
expand all
collapse all
unified
split
pkgs
applications
misc
elf-dissector
default.nix
fix_build_for_src_lib_disassembler_disassembler.diff
+21
-7
pkgs/applications/misc/elf-dissector/default.nix
···
1
1
-
{ mkDerivation, fetchgit, lib, cmake, extra-cmake-modules, kitemmodels
2
2
-
, libiberty, libelf, libdwarf, libopcodes }:
1
1
+
{ lib
2
2
+
, stdenv
3
3
+
, fetchgit
4
4
+
, cmake
5
5
+
, extra-cmake-modules
6
6
+
, wrapQtAppsHook
7
7
+
, kitemmodels
8
8
+
, libiberty
9
9
+
, libelf
10
10
+
, libdwarf
11
11
+
, libopcodes
12
12
+
}:
3
13
4
4
-
mkDerivation rec {
14
14
+
stdenv.mkDerivation rec {
5
15
pname = "elf-dissector";
6
6
-
version = "unstable-2020-11-14";
16
16
+
version = "unstable-2023-06-06";
7
17
8
18
src = fetchgit {
9
19
url = "https://invent.kde.org/sdk/elf-dissector.git";
10
10
-
rev = "d1700e76e3f60aff0a2a9fb63bc001251d2be522";
11
11
-
sha256 = "1h1xr3ag1sbf005drcx8g8dc5mk7fb2ybs73swrld7clcawhxnk8";
20
20
+
rev = "de2e80438176b4b513150805238f3333f660718c";
21
21
+
hash = "sha256-2yHPVPu6cncXhFCJvrSodcRFVAxj4vn+e99WhtiZniM=";
12
22
};
13
23
14
14
-
nativeBuildInputs = [ cmake extra-cmake-modules ];
24
24
+
patches = [
25
25
+
./fix_build_for_src_lib_disassembler_disassembler.diff
26
26
+
];
27
27
+
28
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
1
+
diff --git a/src/lib/disassmbler/disassembler.cpp b/src/lib/disassmbler/disassembler.cpp
2
2
+
index 3277544..e77ffc4 100644
3
3
+
--- a/src/lib/disassmbler/disassembler.cpp
4
4
+
+++ b/src/lib/disassmbler/disassembler.cpp
5
5
+
@@ -127,7 +127,7 @@ QString Disassembler::disassembleBinutils(const unsigned char* data, uint64_t si
6
6
+
QString result;
7
7
+
disassembler_ftype disassemble_fn;
8
8
+
disassemble_info info;
9
9
+
- INIT_DISASSEMBLE_INFO(info, &result, qstring_printf);
10
10
+
+ INIT_DISASSEMBLE_INFO(info, &result, qstring_printf, qstring_printf);
11
11
+
12
12
+
info.application_data = this;
13
13
+
info.flavour = bfd_target_elf_flavour;