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

Revert "diffoscope: wrap executable and include tools in PATH"

Browse Source 
This reverts commit 23ad77b9980fdd7f943da38cd745c4ccfdda15a7.

Double wrapper scripts considered harmful.
This commit is contained in:
Eelco Dolstra 2017-07-21 15:00:50 +02:00
parent d0bcb41d2d
commit 3e68facc72
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/misc/diffoscope/default.nix
View File

@ -5,13 +5,7 @@
, enableBloat ? false , enableBloat ? false
}: }:
# Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf python3.pkgs.buildPythonApplication rec {
# Also these libraries: python3-guestfs
# FIXME: move xxd into a separate package so we don't have to pull in all of vim.
let tools = [ acl binutils bzip2 cbfstool cdrkit 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 ];
in python3.pkgs.buildPythonApplication rec {
pname = "diffoscope"; pname = "diffoscope";
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "77"; version = "77";
@ -32,6 +26,14 @@ in python3.pkgs.buildPythonApplication rec {
sed -i setup.py -e "/'rpm-python',/d" sed -i setup.py -e "/'rpm-python',/d"
''; '';
# 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
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 ]; 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
@ -39,7 +41,6 @@ in python3.pkgs.buildPythonApplication rec {
postInstall = '' postInstall = ''
mkdir -p $out/share/man/man1 mkdir -p $out/share/man/man1
${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1 ${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1
wrapProgram $out/bin/diffoscope --prefix PATH : ${lib.makeBinPath tools}
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {