From d433cd1ff9a1507d3dcd0dd8f11085bb825ddafb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 28 Sep 2021 17:57:29 +0200 Subject: [PATCH] git-extras: move bash completion under share, patch less files --- .../git-and-tools/git-extras/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index 387a1cb59c58..d57fe657517b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -11,15 +11,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-ACuTb1DGft2/32Ezg23jhpl9yua5kUTZ2kKL8KHU+BU="; }; - nativeBuildInputs = [ unixtools.column which ]; + postPatch = '' + patchShebangs check_dependencies.sh + ''; + + nativeBuildInputs = [ + unixtools.column + which + ]; dontBuild = true; - preInstall = '' - patchShebangs . - ''; - - installFlags = [ "PREFIX=${placeholder "out"}" ]; + installFlags = [ + "PREFIX=${placeholder "out"}" + "SYSCONFDIR=${placeholder "out"}/share" + ]; postInstall = '' # bash completion is already handled by make install