Skip to content

git: move credential helpers to exec path #347515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khaneliman merged 1 commit into from
Apr 21, 2025
Merged

git: move credential helpers to exec path #347515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions pkgs/applications/version-management/git/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,23 @@ stdenv.mkDerivation (finalAttrs: {

preInstall =
lib.optionalString osxkeychainSupport ''
mkdir -p $out/libexec/git-core
ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/libexec/git-core/

# ideally unneeded, but added for backwards compatibility
mkdir -p $out/bin
ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/
ln -s $out/libexec/git-core/git-credential-osxkeychain $out/bin/

rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o
''
+ lib.optionalString withLibsecret ''
mkdir -p $out/libexec/git-core
ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/libexec/git-core/

# ideally unneeded, but added for backwards compatibility
mkdir -p $out/bin
ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/
ln -s $out/libexec/git-core/git-credential-libsecret $out/bin/

rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o
'';

Expand Down Expand Up @@ -340,8 +350,11 @@ stdenv.mkDerivation (finalAttrs: {
''
+ lib.optionalString perlSupport ''
# wrap perl commands
makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \
makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/libexec/git-core/git-credential-netrc \
--set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
# ideally unneeded, but added for backwards compatibility
ln -s $out/libexec/git-core/git-credential-netrc $out/bin/

wrapProgram $out/libexec/git-core/git-cvsimport \
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
wrapProgram $out/libexec/git-core/git-archimport \
Expand Down Expand Up @@ -419,7 +432,6 @@ stdenv.mkDerivation (finalAttrs: {
''
)
+ lib.optionalString osxkeychainSupport ''
ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/libexec/git-core/
# enable git-credential-osxkeychain on darwin if desired (default)
mkdir -p $out/etc
cat > $out/etc/gitconfig << EOF
Expand Down