mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-26 02:05:02 +00:00
git: remove uses of *FlagsArray
Since structuredAttrs are enabled, the *Flags variables already are arrays.
This commit is contained in:
@@ -236,7 +236,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=( perllibdir=$out/$(perl -MConfig -wle 'print substr $Config{installsitelib}, 1 + length $Config{siteprefixexp}') )
|
||||
makeFlags+=( perllibdir=$out/$(perl -MConfig -wle 'print substr $Config{installsitelib}, 1 + length $Config{siteprefixexp}') )
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
@@ -282,7 +282,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}}
|
||||
SHELL="$SHELL"
|
||||
)
|
||||
concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
|
||||
concatTo flagsArray makeFlags buildFlags
|
||||
echoCmd 'build flags' "''${flagsArray[@]}"
|
||||
''
|
||||
+ lib.optionalString withManual ''
|
||||
@@ -343,7 +343,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
''${enableParallelInstalling:+-j''${NIX_BUILD_CORES}}
|
||||
SHELL="$SHELL"
|
||||
)
|
||||
concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray
|
||||
concatTo flagsArray makeFlags installFlags
|
||||
echoCmd 'install flags' "''${flagsArray[@]}"
|
||||
|
||||
# Install git-subtree.
|
||||
@@ -486,7 +486,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
installCheckTarget = "test";
|
||||
|
||||
# see also installCheckFlagsArray
|
||||
# see also installCheckFlags in preInstallCheck
|
||||
installCheckFlags = [
|
||||
"DEFAULT_TEST_TARGET=prove"
|
||||
"PERL_PATH=${buildPackages.perl}/bin/perl"
|
||||
@@ -510,7 +510,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
NIX_BUILD_CORES=32
|
||||
fi
|
||||
|
||||
installCheckFlagsArray+=(
|
||||
installCheckFlags+=(
|
||||
GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save"
|
||||
GIT_TEST_INSTALLED=$out/bin
|
||||
${lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"}
|
||||
|
||||
Reference in New Issue
Block a user