summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2020-01-14 22:08:42 +0100
committerGitHub <noreply@github.com>2020-01-14 22:08:42 +0100
commitece829033b7b8f4e81261fef5427144df4147bc4 (patch)
tree8473f6ebfa0d4caf10593c1db9d343b0579f423b /pkgs
parent00a2084a409e65e9781e9792644bbf5b1b1bca5a (diff)
parentef09cebc967ff08daeb9e8d5795d43633b4667bf (diff)
downloadnixpkgs-ece829033b7b8f4e81261fef5427144df4147bc4.tar
nixpkgs-ece829033b7b8f4e81261fef5427144df4147bc4.tar.gz
nixpkgs-ece829033b7b8f4e81261fef5427144df4147bc4.tar.bz2
nixpkgs-ece829033b7b8f4e81261fef5427144df4147bc4.tar.lz
nixpkgs-ece829033b7b8f4e81261fef5427144df4147bc4.tar.xz
nixpkgs-ece829033b7b8f4e81261fef5427144df4147bc4.tar.zst
nixpkgs-ece829033b7b8f4e81261fef5427144df4147bc4.zip
Merge pull request #77666 from LnL7/darwin-diffoscope
diffoscope: enable on darwin
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/misc/diffoscope/default.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index b64c527a6b9..c9f61ee3459 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -35,11 +35,14 @@ python3Packages.buildPythonApplication rec {
   #
   # Still missing these tools: abootimg docx2txt dumpxsb enjarify js-beautify lipo oggDump otool procyon-decompiler Rscript wasm2wat zipnode
   # Also these libraries: python3-guestfs
-  pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm pyxattr ] ++ [
-      acl binutils-unwrapped bzip2 cdrkit colordiff coreutils cpio db diffutils
+  pythonPath = [
+      binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils
       dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
-      libarchive libcaca lz4 pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz
-    ] ++ lib.optionals enableBloat [
+      libarchive libcaca lz4 pgpdump sng sqlite squashfsTools unzip xxd xz
+    ]
+    ++ (with python3Packages; [ debian libarchive-c python_magic tlsh rpm progressbar33 ])
+    ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ]
+    ++ lib.optionals enableBloat [
       apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg gnumeric imagemagick
       llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv
       python3Packages.guestfs
@@ -69,6 +72,6 @@ python3Packages.buildPythonApplication rec {
     homepage    = https://wiki.debian.org/ReproducibleBuilds;
     license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ dezgeg ];
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
   };
 }