commit bab500a21ac81b122bc9b573429b724eb74225e1 · pyrox.dev/nixpkgs

+13 -11

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
       -
       , fetchgit

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
        
       , cmake

     

       5
       5
       +
       , elfutils

     

       5
       6
        
       , extra-cmake-modules

     

       6
       6
       -
       , wrapQtAppsHook

     

       7
       7
        
       , kitemmodels

     

       8
       8
        
       , libiberty

     

       9
       9
       -
       , libelf

     

       10
       9
        
       , libdwarf

     

       11
       10
        
       , libopcodes

     

       11
       11
       +
       , wrapQtAppsHook

     

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
       -
       stdenv.mkDerivation rec {

     

       14
       14
       +
       stdenv.mkDerivation {

     

       15
       15
        
         pname = "elf-dissector";

     

       16
       16
       -
         version = "unstable-2023-06-06";

     

       16
       16
       +
         version = "unstable-2023-12-24";

     

       17
       17
        
       

     

       18
       18
       -
         src = fetchgit {

     

       19
       19
       -
           url = "https://invent.kde.org/sdk/elf-dissector.git";

     

       20
       20
       -
           rev = "de2e80438176b4b513150805238f3333f660718c";

     

       21
       21
       -
           hash = "sha256-2yHPVPu6cncXhFCJvrSodcRFVAxj4vn+e99WhtiZniM=";

     

       18
       18
       +
         src = fetchFromGitLab {

     

       19
       19
       +
           domain = "invent.kde.org";

     

       20
       20
       +
           owner = "sdk";

     

       21
       21
       +
           repo = "elf-dissector";

     

       22
       22
       +
           rev = "613538bd1d87ce72d5115646551a49cf7ff2ee34";

     

       23
       23
       +
           hash = "sha256-fQFGFw8nZHMs8J1W2CcHAJCdcvaY2l2/CySyBSsKpyE=";

     

       22
       24
        
         };

     

       23
       25
        
       

     

       24
       26
        
         patches = [

     
···

       27
       29
        
       

     

       28
       30
        
         nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];

     

       29
       31
        
       

     

       30
       30
       -
         buildInputs = [ kitemmodels libiberty libelf libdwarf libopcodes ];

     

       32
       32
       +
         buildInputs = [ kitemmodels libiberty elfutils libopcodes libdwarf ];

     

       31
       33
        
       

     

       32
       34
        
         meta = with lib; {

     

       33
       35
        
           homepage = "https://invent.kde.org/sdk/elf-dissector";

     

       34
       36
        
           description = "Tools for inspecting, analyzing and optimizing ELF files";

     

       35
       37
        
           license = licenses.gpl2;

     

       36
       36
       -
           maintainers = with maintainers; [ ehmry ];

     

       38
       38
       +
           maintainers = with maintainers; [ ehmry philiptaron ];

     

       37
       39
        
         };

     

       38
       40
        
       }

+6 -2

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

     

       2
       2
       +
       index 8ff058e..dbd4bbe 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

     

       5
       5
       +
       @@ -144,11 +144,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
       +
       -#if BINUTILS_VERSION >= BINUTILS_VERSION_CHECK(2, 39)

     

       10
       10
       +
       -    INIT_DISASSEMBLE_INFO(info, &result, qstring_printf, fprintf_styled);

     

       11
       11
       +
       -#else

     

       9
       12
        
       -    INIT_DISASSEMBLE_INFO(info, &result, qstring_printf);

     

       13
       13
       +
       -#endif

     

       10
       14
        
       +    INIT_DISASSEMBLE_INFO(info, &result, qstring_printf, qstring_printf);

     

       11
       15
        
        

     

       12
       16
        
            info.application_data = this;

+1 -3

pkgs/top-level/all-packages.nix

···

       31330
       31330
        
       

     

       31331
       31331
        
         electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { };

     

       31332
       31332
        
       

     

       31333
       31333
       -
         elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector {

     

       31334
       31334
       -
           libdwarf = libdwarf_20210528;

     

       31335
       31335
       -
         };

     

       31333
       31333
       +
         elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { };

     

       31336
       31334
        
       

     

       31337
       31335
        
         elfx86exts = callPackage ../applications/misc/elfx86exts { };

     

       31338
       31336