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

diffoscope: fix build on Darwin

Browse source 
Moved packages requiring x86_64-linux, x86_64-darwin into their proper arrays.
This commit is contained in:
Raito Bezarius 2023-05-24 00:38:49 +02:00
parent 21332b8fd5
commit 5e8671460b
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,10 +57,15 @@ python3Packages.buildPythonApplication rec {
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr python3Packages.rpm acl cdrkit dtc ] ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr python3Packages.rpm acl cdrkit dtc ]
++ lib.optionals enableBloat ( ++ lib.optionals enableBloat (
[ [
abootimg apksigcopier apksigner cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric apksigcopier apksigner enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg pdftk
hdf5 imagemagick libcaca 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 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. # `apktool` depend on `build-tools` which requires Android SDK acceptance, therefore, the whole thing is unfree.
++ lib.optionals enableUnfree [ apktool ] ++ lib.optionals enableUnfree [ apktool ]
); );