From 23ad77b9980fdd7f943da38cd745c4ccfdda15a7 Mon Sep 17 00:00:00 2001
From: Kai Harries <kai.harries@gmail.com>
Date: Thu, 20 Jul 2017 22:19:11 +0200
Subject: diffoscope: wrap executable and include tools in PATH

diffoscope was looking for the tools it uses during runtime, but the
tools there neither part of the closure nor were they in the
PATH. This commit fixes this.
---
 pkgs/tools/misc/diffoscope/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'pkgs/tools/misc/diffoscope')

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 4f0a9ba12c11..37af52f55b63 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -5,7 +5,13 @@
 , enableBloat ? false
 }:
 
-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.
+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";
   name = "${pname}-${version}";
   version = "77";
@@ -26,14 +32,6 @@ 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
@@ -41,6 +39,7 @@ 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; {
-- 
cgit 1.4.1