mirror of
https://github.com/NixOS/nix.git
synced 2025-11-09 12:06:01 +01:00
Merge pull request #14306 from corngood/develop-structuredAttrs-fix
nix/develop: Strip outputChecks when structuredAttrs is enabled
This commit is contained in:
commit
67f5cb97a3
1 changed files with 9 additions and 4 deletions
|
|
@ -254,10 +254,15 @@ static StorePath getDerivationEnvironment(ref<Store> store, ref<Store> evalStore
|
||||||
drv.args = {store->printStorePath(getEnvShPath)};
|
drv.args = {store->printStorePath(getEnvShPath)};
|
||||||
|
|
||||||
/* Remove derivation checks. */
|
/* Remove derivation checks. */
|
||||||
drv.env.erase("allowedReferences");
|
if (drv.structuredAttrs) {
|
||||||
drv.env.erase("allowedRequisites");
|
drv.structuredAttrs->structuredAttrs.erase("outputChecks");
|
||||||
drv.env.erase("disallowedReferences");
|
} else {
|
||||||
drv.env.erase("disallowedRequisites");
|
drv.env.erase("allowedReferences");
|
||||||
|
drv.env.erase("allowedRequisites");
|
||||||
|
drv.env.erase("disallowedReferences");
|
||||||
|
drv.env.erase("disallowedRequisites");
|
||||||
|
}
|
||||||
|
|
||||||
drv.env.erase("name");
|
drv.env.erase("name");
|
||||||
|
|
||||||
/* Rehash and write the derivation. FIXME: would be nice to use
|
/* Rehash and write the derivation. FIXME: would be nice to use
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue