Merge staging-next into staging

NixOS · Dec 10, 2024 · c207a2b · c207a2b
2 parents acf356a + 0396ae7
commit c207a2b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
@@ -240,6 +240,7 @@ sub addPkg {
     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 @@ sub addPkg {
     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 @@ sub addPkg {
         chomp $line;
         addPkg($line,
                $ENV{"ignoreCollisions"} eq "1",
+               $ENV{"ignoreSingleFileOutputs"} eq "1",
                $ENV{"checkCollisionContents"} eq "1",
                1000)
             if -d $line;