diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-07-21 15:08:30 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-07-21 15:15:12 +0200 |
| commit | 91dc81156647c5d28e77dfd20d5c2f4b7253c742 (patch) | |
| tree | 62e3f70487fda6cdd70c3e923454a91c1bf6dbb9 | |
| parent | 3e68facc72db94224cf8955bfe6745537deaf1eb (diff) | |
| download | nixpkgs-91dc81156647c5d28e77dfd20d5c2f4b7253c742.tar nixpkgs-91dc81156647c5d28e77dfd20d5c2f4b7253c742.tar.gz nixpkgs-91dc81156647c5d28e77dfd20d5c2f4b7253c742.tar.bz2 nixpkgs-91dc81156647c5d28e77dfd20d5c2f4b7253c742.tar.lz nixpkgs-91dc81156647c5d28e77dfd20d5c2f4b7253c742.tar.xz nixpkgs-91dc81156647c5d28e77dfd20d5c2f4b7253c742.tar.zst nixpkgs-91dc81156647c5d28e77dfd20d5c2f4b7253c742.zip | |
diffoscope: Move all required tools into pythonPath
Alternative fix for #27534 that prevents the use of a double wrapper (creating even uglier script names than usual, like ..diffoscope-wrapped-wrapped). This was my bad in 96d7f35e96f5b8baa249ce1d7b237a3f34ee87ab.
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 4f0a9ba12c1..9c0d51c4a85 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -29,12 +29,10 @@ python3.pkgs.buildPythonApplication rec { # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf # Also these libraries: python3-guestfs # FIXME: move xxd into a separate package so we don't have to pull in all of vim. - buildInputs = - map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext + pythonPath = with python3.pkgs; + [ debian libarchive-c python_magic tlsh rpm cdrkit acl binutils bzip2 cbfstool cpio diffutils e2fsprogs file gettext gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff - ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]); - - pythonPath = with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ]; + ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root |