From 5e8671460b86c7091886d4487000a574eed9cd36 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 24 May 2023 00:38:49 +0200 Subject: [PATCH] diffoscope: fix build on Darwin Moved packages requiring x86_64-linux, x86_64-darwin into their proper arrays. --- pkgs/tools/misc/diffoscope/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 1b9e743b4266..88c6af2bdc04 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -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 ] );