LocalDerivationGoal: set NIX_ATTRS_*_FILE correctly for sandboxed builds #8053
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
edolstra
approved these changes
Mar 16, 2023
| @@ -1154,10 +1154,10 @@ void LocalDerivationGoal::writeStructuredAttrs() | |||
|
|
|||
| writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites)); | |||
| chownToBuilder(tmpDir + "/.attrs.sh"); | |||
| env["NIX_ATTRS_SH_FILE"] = tmpDir + "/.attrs.sh"; | |||
| env["NIX_ATTRS_SH_FILE"] = env["NIX_BUILD_TOP"] + "/.attrs.sh"; | |||
There was a problem hiding this comment.
Suggested change
| env["NIX_ATTRS_SH_FILE"] = env["NIX_BUILD_TOP"] + "/.attrs.sh"; | |
| env["NIX_ATTRS_SH_FILE"] = tmpDirInSandbox + "/.attrs.sh"; |
| writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites)); | ||
| chownToBuilder(tmpDir + "/.attrs.json"); | ||
| env["NIX_ATTRS_JSON_FILE"] = tmpDir + "/.attrs.json"; | ||
| env["NIX_ATTRS_JSON_FILE"] = env["NIX_BUILD_TOP"] + "/.attrs.json"; |
There was a problem hiding this comment.
Suggested change
| env["NIX_ATTRS_JSON_FILE"] = env["NIX_BUILD_TOP"] + "/.attrs.json"; | |
| env["NIX_ATTRS_JSON_FILE"] = tmpDirInSandbox + "/.attrs.json"; |
lheckemann
force-pushed
the
fix-structuredattrs-sandbox
branch
from
bf7e34e to
af4cbda
Compare
|
It'd be great to get a test in place for this behavior, too. |
|
Successfully created backport PR for |
|
Successfully created backport PR for |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
NIX_ATTRS_JSON_FILEwas set to the out-of-sandbox path even in sandboxed builds.Context
Checklist for maintainers
Maintainers: tick if completed or explain if not relevant
tests/**.shsrc/*/teststests/nixos/*Priorities
Add 👍 to pull requests you find important.