public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diffoscope: Move all required tools into pythonPath

Browse Source 
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 96d7f35e96.
This commit is contained in:
Eelco Dolstra
2017-07-21 15:15:12 +02:00
parent 3e68facc72
commit 91dc811566
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/diffoscope/default.nix
+3 -5
View File
@@ -29,12 +29,10 @@ python3.pkgs.buildPythonApplication rec {
# Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
# Also these libraries: python3-guestfs # Also these libraries: python3-guestfs
# FIXME: move xxd into a separate package so we don't have to pull in all of vim. # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
buildInputs = pythonPath = with python3.pkgs;
map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext [ 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 gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]); ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ];
pythonPath = with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ];
doCheck = false; # Calls 'mknod' in squashfs tests, which needs root doCheck = false; # Calls 'mknod' in squashfs tests, which needs root