cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

diffoscope: use multitarget binutils

Browse source 
multitarget binutils is useful for diffing for directories with binaries
foreign to system where diffoscope runs.

before the change:

    $ nix run nixpkgs#diffoscope /tmp/a-Mcrt1.o /tmp/b-Mcrt1.o
    2022-07-27 21:20:35 E: diffoscope.comparators.elf: Command '['objdump --line-numbers --disassemble --demangle --reloc --no-show-raw-insn --section=.text {}']' returned non-zero exit status 1.
    2022-07-27 21:20:35 E: diffoscope.comparators.elf: Command '['objdump --disassemble --demangle --no-show-raw-insn --section=.text {}']' returned non-zero exit status 1.
    --- /tmp/a-Mcrt1.o
    +++ /tmp/b-Mcrt1.o
    ├── readelf --wide --decompress --string-dump=.debug_str {}
    ...

After the change:

    ./result/bin/diffoscope /tmp/a-Mcrt1.o /tmp/b-Mcrt1.o
    --- /tmp/a-Mcrt1.o
    +++ /tmp/b-Mcrt1.o
    ├── readelf --wide --decompress --string-dump=.debug_str {}
    ...
This commit is contained in:
Sergei Trofimovich 2022-07-27 22:19:21 +01:00
parent 3ddbf2094e
commit 0fdceb52c7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/misc/diffoscope/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles
, abootimg, acl, apksigner, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
, abootimg, acl, apksigner, apktool, binutils-unwrapped-all-targets, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
, e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R
, radare2, sng, sqlite, squashfsTools, tcpdump, ubootTools, odt2txt, unzip, wabt, xmlbeans, xxd, xz, zip, zstd
@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
#
# Still missing these tools: docx2txt lipo otool r2pipe
pythonPath = [
binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils
binutils-unwrapped-all-targets bzip2 colordiff coreutils cpio db diffutils
e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
libarchive lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd
xz zip zstd