Skip to content

Commit

Permalink
diffoscope: fix build on Darwin
Browse files Browse the repository at this point in the history
Moved packages requiring x86_64-linux, x86_64-darwin into their proper arrays.
  • Loading branch information
RaitoBezarius committed May 23, 2023
1 parent 21332b8 commit 5e86714
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions pkgs/tools/misc/diffoscope/default.nix
Expand Up @@ -57,10 +57,15 @@ python3Packages.buildPythonApplication rec {
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr python3Packages.rpm acl cdrkit dtc ]
++ lib.optionals enableBloat (
[
abootimg apksigcopier apksigner cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans
apksigcopier apksigner enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg pdftk
hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt openssh
poppler_utils procyon qemu R tcpdump wabt radare2 xmlbeans
]
++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer-six ])
++ (with python3Packages; [ androguard binwalk h5py pdfminer-six ])
# oggvideotools is broken on Darwin, please put it back when it will be fixed?
++ lib.optionals stdenv.isLinux [ abootimg cbfstool colord ubootTools python3Packages.guestfs oggvideotools ]
# This doesn't work on aarch64-darwin
++ lib.optionals (stdenv.isx86_64 || stdenv.isLinux) [ gnumeric ]
# `apktool` depend on `build-tools` which requires Android SDK acceptance, therefore, the whole thing is unfree.
++ lib.optionals enableUnfree [ apktool ]
);
Expand Down

0 comments on commit 5e86714

Please sign in to comment.