nixos/system-environment: prepend wrapperDir to PATH #70430
Merged
+7
−0
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
ofborg
bot
added
6.topic: nixos
|
@hedning Really good catch 👍 I actually noticed this on a couple of occasions now. An aside, I've seen all sorts of upstream reports about environment pollution with the systemd sessions. (etc.) |
10 tasks
10 tasks
|
I'll merge this soon if no one has any clever ideas on how to accomplish this in a somewhat less ad-hoc way :) It's no fun for users to get stuck in a broken session. |
|
@hedning 👍 to this, been rolling with this patch for a bit. |
This fixes user environment setup for sessions which doesn't successfully go through a shell init. Note we don't go through `sessionVariables` as we want the wrappers to have highest priority. It would also cause wrapperDir to occur twice when in shell sessions, as it shells use sessionVariables too while prepending wrapperDir in a custom snippet. In particular logging in and out of gnome-shell could result in a broken path without this fix.
hedning
force-pushed
the
set-session-wrappers-path
branch
from
8d1e165 to
a589847
Compare
|
This works at least. We should probably take a look at only specifying wrapperDir once in such a way that both shell and system environments picks it up correctly, but lets do that later. |
dtzWill
pushed a commit
to dtzWill/nixpkgs
that referenced
this pull request
Feb 4, 2020
This fixes user environment setup for sessions which doesn't successfully go through a shell init. Note we don't go through `sessionVariables` as we want the wrappers to have highest priority. It would also cause wrapperDir to occur twice when in shell sessions, as shells use `sessionVariables` too while prepending wrapperDir in a custom snippet. In particular logging in and out of gnome-shell could result in a broken path without this fix. (cherry picked from commit 2c7f0f0)
rycee
pushed a commit
to rycee/nixpkgs
that referenced
this pull request
Mar 30, 2020
This fixes user environment setup for sessions which doesn't successfully go through a shell init. Note we don't go through `sessionVariables` as we want the wrappers to have highest priority. It would also cause wrapperDir to occur twice when in shell sessions, as shells use `sessionVariables` too while prepending wrapperDir in a custom snippet. In particular logging in and out of gnome-shell could result in a broken path without this fix. (cherry picked from commit 2c7f0f0)
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 for this change
This fixes user environment setup for sessions which doesn't successfully go
through a shell init.
Note we don't go through
sessionVariablesas we want the wrappers to havehighest priority. It would also cause wrapperDir to occur twice when in shell
sessions, as it shells use sessionVariables too while prepending wrapperDir in a
custom snippet.
In particular logging in and out of gnome-shell could result in a broken path
without this fix.
Some more gnome specifics. Apparently gnome-session now does mess up having the environment reliably set up through a shell. I tried patching gnome-session without luck. This is anyway a better fix though :)
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @