stdenv.mkDerivation: inputDerivation: fix for __structuredAttrs = true (#368226)
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user