From 2b6f959c3b86ee61e1966192549f795198aae7d1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 21 Aug 2020 17:21:42 +0200 Subject: [PATCH] gitAndTools.diff-so-fancy: Fix shebang patching and clean up perl is a runtime dependency so it needs to be in buildInputs, otherwise patchShebangs hook will not see it. --- .../git-and-tools/diff-so-fancy/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index c073edaee7d8..ffdb788745a7 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -11,12 +11,19 @@ stdenv.mkDerivation rec { sha256 = "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl"; }; - # Perl is needed here for patchShebangs - nativeBuildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; - buildPhase = null; + buildInputs = [ + perl # needed for patchShebangs + ]; + + dontBuild = true; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/lib/diff-so-fancy # diff-so-fancy executable searches for it's library relative to @@ -32,6 +39,8 @@ stdenv.mkDerivation rec { --prefix PATH : "${git}/bin" \ --prefix PATH : "${coreutils}/bin" \ --prefix PATH : "${ncurses.out}/bin" + + runHook postInstall ''; meta = with stdenv.lib; {