about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorHoang Xuan Phu <phuhimself@phunehehe.net>2017-10-23 18:49:58 +0800
committerHoang Xuan Phu <phuhimself@phunehehe.net>2017-10-23 19:05:59 +0800
commitacbe3a869c15a94c89f409f81b3e9cfc89d7f3a3 (patch)
tree4abee617e0175475a45dff3083244f8fc8ed2269 /pkgs
parent24c61cafa50ef02b9b0252d698fc3c2d05b893e6 (diff)
downloadnixlib-acbe3a869c15a94c89f409f81b3e9cfc89d7f3a3.tar
nixlib-acbe3a869c15a94c89f409f81b3e9cfc89d7f3a3.tar.gz
nixlib-acbe3a869c15a94c89f409f81b3e9cfc89d7f3a3.tar.bz2
nixlib-acbe3a869c15a94c89f409f81b3e9cfc89d7f3a3.tar.lz
nixlib-acbe3a869c15a94c89f409f81b3e9cfc89d7f3a3.tar.xz
nixlib-acbe3a869c15a94c89f409f81b3e9cfc89d7f3a3.tar.zst
nixlib-acbe3a869c15a94c89f409f81b3e9cfc89d7f3a3.zip
git-crypt: add runtime dependencies to PATH
git-crypt won't work if git and git-crypt are not in PATH. This surfaced
after dbb8958. Test like this:

```
PATH= $(nix-build --no-out-link '<nixpkgs>' --attr git-crypt)/bin/git-crypt unlock
```
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-crypt/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index 98cce6178335..0d6b206cb4a4 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, openssl, gnupg1compat, makeWrapper }:
+{ fetchFromGitHub, git, gnupg1compat, makeWrapper, openssl, stdenv }:
 
 stdenv.mkDerivation rec {
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     make install PREFIX=$out
-    wrapProgram $out/bin/* --prefix PATH : ${gnupg1compat}/bin
+    wrapProgram $out/bin/* --prefix PATH : $out/bin:${git}/bin:${gnupg1compat}/bin
   '';
 
   meta = with stdenv.lib; {