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

buildEnv: fix bulder.pl (addPkg argument ignoreSingleFileOutputs)

Browse Source 
Specify the ignoreSingleFileOutputs parameter wherever calling addPkg.
This commit is contained in:
Yueh-Shun Li
2024-12-10 04:20:38 +08:00
parent ceb62729d2
commit a993958324
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/buildenv/builder.pl
+3 -1
View File
@@ -240,6 +240,7 @@ for my $pkg (@{decode_json $pkgs}) {
for my $path (@{$pkg->{paths}}) {
addPkg($path,
$ENV{"ignoreCollisions"} eq "1",
$ENV{"ignoreSingleFileOutputs"} eq "1",
$ENV{"checkCollisionContents"} eq "1",
$pkg->{priority})
if -e $path;
@@ -256,7 +257,7 @@ while (scalar(keys %postponed) > 0) {
my @pkgDirs = keys %postponed;
%postponed = ();
foreach my $pkgDir (sort @pkgDirs) {
addPkg($pkgDir, 2, $ENV{"checkCollisionContents"} eq "1", $priorityCounter++);
addPkg($pkgDir, 2, $ENV{"ignoreSingleFileOutputs"} eq "1", $ENV{"checkCollisionContents"} eq "1", $priorityCounter++);
}
}
@@ -268,6 +269,7 @@ if ($extraPathsFilePath) {
chomp $line;
addPkg($line,
$ENV{"ignoreCollisions"} eq "1",
$ENV{"ignoreSingleFileOutputs"} eq "1",
$ENV{"checkCollisionContents"} eq "1",
1000)
if -d $line;