summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@sap.com>2021-09-28 17:57:29 +0200
committerSandro Jäckel <sandro.jaeckel@sap.com>2021-09-28 17:58:06 +0200
commitd433cd1ff9a1507d3dcd0dd8f11085bb825ddafb (patch)
tree58028fe504cd1247cf0428a1834f2389e78a46d0
parente3b5143614b6242b65f09b71850e1807126e2f33 (diff)
downloadnixpkgs-d433cd1ff9a1507d3dcd0dd8f11085bb825ddafb.tar
nixpkgs-d433cd1ff9a1507d3dcd0dd8f11085bb825ddafb.tar.gz
nixpkgs-d433cd1ff9a1507d3dcd0dd8f11085bb825ddafb.tar.bz2
nixpkgs-d433cd1ff9a1507d3dcd0dd8f11085bb825ddafb.tar.lz
nixpkgs-d433cd1ff9a1507d3dcd0dd8f11085bb825ddafb.tar.xz
nixpkgs-d433cd1ff9a1507d3dcd0dd8f11085bb825ddafb.tar.zst
nixpkgs-d433cd1ff9a1507d3dcd0dd8f11085bb825ddafb.zip
git-extras: move bash completion under share, patch less files
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-extras/default.nix18
1 files 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 387a1cb59c5..d57fe657517 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
+  '';
 
-  dontBuild = true;
+  nativeBuildInputs = [
+    unixtools.column
+    which
+  ];
 
-  preInstall = ''
-    patchShebangs .
-  '';
+  dontBuild = true;
 
-  installFlags = [ "PREFIX=${placeholder "out"}" ];
+  installFlags = [
+    "PREFIX=${placeholder "out"}"
+    "SYSCONFDIR=${placeholder "out"}/share"
+  ];
 
   postInstall = ''
     # bash completion is already handled by make install