diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-07-21 15:00:50 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-07-21 15:15:04 +0200 |
| commit | 3e68facc72db94224cf8955bfe6745537deaf1eb (patch) | |
| tree | b2555336eccec5b9136d01801d03c59e474fd89a /pkgs/tools/misc/diffoscope | |
| parent | d0bcb41d2d5659c8e8cefa8477c8c7c060aa88c7 (diff) | |
| download | nixlib-3e68facc72db94224cf8955bfe6745537deaf1eb.tar nixlib-3e68facc72db94224cf8955bfe6745537deaf1eb.tar.gz nixlib-3e68facc72db94224cf8955bfe6745537deaf1eb.tar.bz2 nixlib-3e68facc72db94224cf8955bfe6745537deaf1eb.tar.lz nixlib-3e68facc72db94224cf8955bfe6745537deaf1eb.tar.xz nixlib-3e68facc72db94224cf8955bfe6745537deaf1eb.tar.zst nixlib-3e68facc72db94224cf8955bfe6745537deaf1eb.zip | |
Revert "diffoscope: wrap executable and include tools in PATH"
This reverts commit 23ad77b9980fdd7f943da38cd745c4ccfdda15a7. Double wrapper scripts considered harmful.
Diffstat (limited to 'pkgs/tools/misc/diffoscope')
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 37af52f55b63..4f0a9ba12c11 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -5,13 +5,7 @@ , enableBloat ? false }: - # 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. -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 { +python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; name = "${pname}-${version}"; version = "77"; @@ -32,6 +26,14 @@ in python3.pkgs.buildPythonApplication rec { 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 ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root @@ -39,7 +41,6 @@ in python3.pkgs.buildPythonApplication rec { postInstall = '' mkdir -p $out/share/man/man1 ${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; { |