diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-10-10 19:01:42 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-13 00:47:48 -0500 |
| commit | d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410 (patch) | |
| tree | 075aa2008d4bd95a79b8c63827284cc69764c58b /pkgs/tools/misc/diffoscope | |
| parent | f72bffb4c4178bf648bffff2a6692684f69551cd (diff) | |
| download | nixlib-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar nixlib-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.gz nixlib-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.bz2 nixlib-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.lz nixlib-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.xz nixlib-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.zst nixlib-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.zip | |
treewide: Try to avoid depending on binutils directly
One should depend on - `stdenv.cc.bintools`: for executables at build time - `libbfd` or `libiberty`: for those libraries - `targetPackages.cc.bintools`: for exectuables at *run* time - `binutils`: only for specifically GNU Binutils's executables, regardless of the host platform, at run time.
Diffstat (limited to 'pkgs/tools/misc/diffoscope')
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 3fd5bb7daa61..5b42c811bd20 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, python3Packages, docutils -, acl, apktool, binutils, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc +, acl, apktool, libbfd, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar , gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite , squashfsTools, tcpdump, unoconv, unzip, xxd, xz @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { # Still missing these tools: docx2txt enjarify js-beautify oggDump Rscript # Also these libraries: python3-guestfs pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ - acl binutils bzip2 cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file findutils + acl libbfd bzip2 cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip libarchive libcaca pgpdump sng sqlite squashfsTools unzip xxd xz ] ++ lib.optionals enableBloat [ |