Merge pull request #172875 from SuperSandro2000/diffoscopeMinimal

diffoscopeMinimal: move libcaca to bloat to remove graphics libraries…
main
Sandro 2 years ago committed by GitHub
commit 8124bc2c65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      pkgs/tools/misc/diffoscope/default.nix

@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
pythonPath = [ pythonPath = [
binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils
e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
libarchive libcaca lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd libarchive lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd
xz zip zstd xz zip zstd
] ]
++ (with python3Packages; [ ++ (with python3Packages; [
@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec {
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ] ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ]
++ lib.optionals enableBloat ([ ++ lib.optionals enableBloat ([
abootimg apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric abootimg apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
hdf5 imagemagick llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans
] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer ])); ] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer ]));
checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath;

Loading…
Cancel
Save