From 921d046537f6d7f0fc0db07b7aa46be7e9df030b Mon Sep 17 00:00:00 2001 From: Craig Younkins Date: Fri, 14 Dec 2018 15:49:09 -0500 Subject: [PATCH] git: wrap git-credential-netrc to set PERL5LIB (#50992) --- .../version-management/git-and-tools/git/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 88704ef281e..e218872cca3 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -133,7 +133,6 @@ stdenv.mkDerivation { # Install contrib stuff. mkdir -p $out/share/git cp -a contrib $out/share/git/ - ln -s "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/ mkdir -p $out/share/emacs/site-lisp ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/ mkdir -p $out/etc/bash_completion.d @@ -178,6 +177,9 @@ stdenv.mkDerivation { for i in ${builtins.toString perlLibs}; do gitperllib=$gitperllib:$i/lib/perl5/site_perl done + + makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/git-credential-netrc \ + --set PERL5LIB "$gitperllib" wrapProgram $out/libexec/git-core/git-cvsimport \ --set GITPERLLIB "$gitperllib" wrapProgram $out/libexec/git-core/git-add--interactive \