diff --git a/pkgs/applications/misc/elf-dissector/fix_build_for_src_lib_disassembler_disassembler.diff b/pkgs/applications/misc/elf-dissector/fix_build_for_src_lib_disassembler_disassembler.diff deleted file mode 100644 index ccc31c45ccde..000000000000 --- a/pkgs/applications/misc/elf-dissector/fix_build_for_src_lib_disassembler_disassembler.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/lib/disassmbler/disassembler.cpp b/src/lib/disassmbler/disassembler.cpp -index 8ff058e..dbd4bbe 100644 ---- a/src/lib/disassmbler/disassembler.cpp -+++ b/src/lib/disassmbler/disassembler.cpp -@@ -144,11 +144,7 @@ QString Disassembler::disassembleBinutils(const unsigned char* data, uint64_t si - QString result; - disassembler_ftype disassemble_fn; - disassemble_info info; --#if BINUTILS_VERSION >= BINUTILS_VERSION_CHECK(2, 39) -- INIT_DISASSEMBLE_INFO(info, &result, qstring_printf, fprintf_styled); --#else -- INIT_DISASSEMBLE_INFO(info, &result, qstring_printf); --#endif -+ INIT_DISASSEMBLE_INFO(info, &result, qstring_printf, qstring_printf); - - info.application_data = this; - info.flavour = bfd_target_elf_flavour; diff --git a/pkgs/applications/misc/elf-dissector/default.nix b/pkgs/by-name/el/elf-dissector/package.nix similarity index 57% rename from pkgs/applications/misc/elf-dissector/default.nix rename to pkgs/by-name/el/elf-dissector/package.nix index d703d4d08ff2..6b01758f715d 100644 --- a/pkgs/applications/misc/elf-dissector/default.nix +++ b/pkgs/by-name/el/elf-dissector/package.nix @@ -4,38 +4,35 @@ fetchFromGitLab, cmake, elfutils, - extra-cmake-modules, - kitemmodels, + kdePackages, libiberty, libdwarf, libopcodes, - wrapQtAppsHook, + qt6, + qt6Packages, }: stdenv.mkDerivation { pname = "elf-dissector"; - version = "unstable-2023-12-24"; + version = "0.0.1-unstable-2025-11-05"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "sdk"; repo = "elf-dissector"; - rev = "613538bd1d87ce72d5115646551a49cf7ff2ee34"; - hash = "sha256-fQFGFw8nZHMs8J1W2CcHAJCdcvaY2l2/CySyBSsKpyE="; + rev = "37aa18d16e0f1a4fca5a276473ae37b2b93f623d"; + hash = "sha256-O9b6lgJt5SwTwIEohkYpwWxnN0R0w7oEZGrDgj3aGOs="; }; - patches = [ - ./fix_build_for_src_lib_disassembler_disassembler.diff - ]; - nativeBuildInputs = [ cmake - extra-cmake-modules - wrapQtAppsHook + kdePackages.extra-cmake-modules + qt6Packages.wrapQtAppsHook ]; buildInputs = [ - kitemmodels + qt6.qtbase + qt6.qttools libiberty elfutils libopcodes @@ -46,8 +43,6 @@ stdenv.mkDerivation { homepage = "https://invent.kde.org/sdk/elf-dissector"; description = "Tools for inspecting, analyzing and optimizing ELF files"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ - philiptaron - ]; + maintainers = [ lib.maintainers.philiptaron ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c7e682c3436..f5516ab3cc09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10585,8 +10585,6 @@ with pkgs; electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; - elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { }; - inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) emacs30 emacs30-gtk3