public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74213 from ruuda/fix-git-perl-support 

git: fix the "perlSupport = false" configuration
This commit is contained in:
Wout Mertens 2019-11-28 21:13:05 +01:00 committed by GitHub
parent d2ef08d3be 2163fc7f0a
commit acfa5d8324
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -253,7 +253,10 @@ stdenv.mkDerivation {
installCheckTarget = "test"; installCheckTarget = "test";
# see also installCheckFlagsArray # see also installCheckFlagsArray
installCheckFlags = "DEFAULT_TEST_TARGET=prove"; installCheckFlags = [
"DEFAULT_TEST_TARGET=prove"
"PERL_PATH=${buildPackages.perl}/bin/perl"
];
preInstallCheck = '' preInstallCheck = ''
installCheckFlagsArray+=( installCheckFlagsArray+=(
@ -296,6 +299,13 @@ stdenv.mkDerivation {
# Tested to fail: 2.18.0 # Tested to fail: 2.18.0
disable_test t9902-completion "sourcing the completion script clears cached --options" disable_test t9902-completion "sourcing the completion script clears cached --options"
${stdenv.lib.optionalString (!perlSupport) ''
# request-pull is a Bash script that invokes Perl, so it is not available
# when NO_PERL=1, and the test should be skipped, but the test suite does
# not check for the Perl prerequisite.
disable_test t5150-request-pull
''}
# As of 2.19.0, t5562 refers to #!/usr/bin/perl # As of 2.19.0, t5562 refers to #!/usr/bin/perl
patchShebangs t/t5562/invoke-with-content-length.pl patchShebangs t/t5562/invoke-with-content-length.pl
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + stdenv.lib.optionalString stdenv.isDarwin ''