Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: merge the manifest attribute sets better #37

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Conversation

haraldh
Copy link
Collaborator

@haraldh haraldh commented Jun 6, 2024

  • merge the arrays fs.mounts and sgx.trusted_files instead of replacing them.
  • append loader.env.LD_LIBRARY_PATH instead of replacing it.

@haraldh haraldh requested a review from a team as a code owner June 6, 2024 14:55
@haraldh haraldh enabled auto-merge June 6, 2024 14:55
lib/default.nix Outdated Show resolved Hide resolved
pbeza
pbeza previously approved these changes Jun 6, 2024
* merge the arrays `fs.mounts` and `sgx.trusted_files`
  instead of replacing them.
* append `loader.env.LD_LIBRARY_PATH`
  instead of replacing it.

Signed-off-by: Harald Hoyer <[email protected]>
@haraldh haraldh merged commit 49a1ae7 into main Jun 7, 2024
4 checks passed
@haraldh haraldh deleted the recursiveMerge branch June 7, 2024 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants