stdenv.mkDerivation: inputDerivation: fix for __structuredAttrs = true

2024-12-26 08:39:10 +08:00
parent 444c1e08d4
commit 1b3d2ac6f4
1 changed files with 20 additions and 9 deletions
@@ -644,15 +644,26 @@ extendDerivation
             printf "%s" "$(< "''${!pathVar}")" >> $out
         done
       '' ];
-
-       # inputDerivation produces the inputs; not the outputs, so any
-       # restrictions on what used to be the outputs don't serve a purpose
-       # anymore.
-       allowedReferences = null;
-       allowedRequisites = null;
-       disallowedReferences = [ ];
-       disallowedRequisites = [ ];
-     });
+     }
+     // (
+       let
+         sharedOutputChecks = {
+           # inputDerivation produces the inputs; not the outputs, so any
+           # restrictions on what used to be the outputs don't serve a purpose
+           # anymore.
+           allowedReferences = null;
+           allowedRequisites = null;
+           disallowedReferences = [ ];
+           disallowedRequisites = [ ];
+         };
+       in
+       if __structuredAttrs then
+         {
+           outputChecks.out = sharedOutputChecks;
+         }
+       else
+         sharedOutputChecks
+     ));

     inherit passthru overrideAttrs;
     inherit meta;