Repository navigation
Fix portal flatpak-spawn environment handling regression - #6721
Merged
Merged
Conversation
|
This change fixes the issue for me. I applied the patches to my system and now everything works as expected. :) |
bbhtt
reviewed
Jun 30, 2026
bbhtt
reviewed
Jun 30, 2026
bbhtt
approved these changes
Jun 30, 2026
bbhtt
left a comment
Collaborator
There was a problem hiding this comment.
Looks good to me. The test seems to time out for me locally for some reason but clearly works in CI.
swick
force-pushed
the
wip/fix-portal-env
branch
from
June 30, 2026 13:35
713b6a6 to
98389ea
Compare
Collaborator
Author
|
/cc @smcv could you also please take a quick look? |
smcv
reviewed
Jul 6, 2026
This reverts commit a57f6bc. The run-environ from the calling instance is a host-like environment (e.g. on NixOS it contains /nix/store paths). Passing it via --env injects it into the sandbox payload environment where those paths don't exist. Revert the commit, so we pass run-environ as the envp for spawning flatpak run again to let it make host-level decisions (DISPLAY, FLATPAK_GL_DRIVERS, XDG_RUNTIME_DIR, etc.) without leaking into the sandbox. It also passes --clear-env unconditionally, because we'd build up the environment, but the wrong one. We will implement --clear-env properly again in the next few commits. Closes: flatpak#6717 Fixes: a57f6bc ("portal: Clear the environment via flatpak arguments")
Instead of modifying the host-like run environment to clear the sandbox environment, we'll use the new --clear-env flag which does the correct thing. Assisted-by: Claude:opus-4.6 Closes: flatpak#5271
Assisted-by: Claude:opus-4.6
4 tasks done
Collaborator
Author
|
@smcv up for another round or shall I merge? |
algitbot
pushed a commit
to alpinelinux/aports
that referenced
this pull request
Jul 10, 2026
emma-the-rock
pushed a commit
to emma-the-rock/nix-dotfiles
that referenced
this pull request
Jul 13, 2026
Flatpak >=1.18.0 leaks the NixOS host environment into the sandbox, breaking glycin-svg icon loading (e.g. OpenDeck). Pin services.flatpak.package to a nixpkgs-flatpak input locked to a revision with Flatpak 1.16.6, scoped to the Flatpak service only, until flatpak/flatpak#6721 lands in nixpkgs. Co-Authored-By: Claude Sonnet 5 <[email protected]>
2 of 13 tasks
This file contains hidden or 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
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.
See #6717