Merge pull request #15113 from rardiol/gitSVN

git: fix subversion bindings for multiple outputs
This commit is contained in:
zimbatm 2016-05-01 10:10:31 +01:00
commit 6cf44fed13

View File

@ -112,12 +112,12 @@ stdenv.mkDerivation {
''# wrap git-svn ''# wrap git-svn
gitperllib=$out/lib/perl5/site_perl gitperllib=$out/lib/perl5/site_perl
for i in ${builtins.toString perlLibs} ${svn}; do for i in ${builtins.toString perlLibs} ${svn.out}; do
gitperllib=$gitperllib:$i/lib/perl5/site_perl gitperllib=$gitperllib:$i/lib/perl5/site_perl
done done
wrapProgram $out/libexec/git-core/git-svn \ wrapProgram $out/libexec/git-core/git-svn \
--set GITPERLLIB "$gitperllib" \ --set GITPERLLIB "$gitperllib" \
--prefix PATH : "${svn}/bin" '' --prefix PATH : "${svn.out}/bin" ''
else '' # replace git-svn by notification script else '' # replace git-svn by notification script
notSupported $out/libexec/git-core/git-svn notSupported $out/libexec/git-core/git-svn
'') '')