nix-shell: add bashInteractive to the start of the PATH, set SHELL #2455
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
|
cc @scoates who found the issue |
edolstra
reviewed
Sep 27, 2018
src/nix-build/nix-build.cc
Outdated
| @@ -417,16 +417,19 @@ void mainWrapped(int argc, char * * argv) | |||
| "dontAddDisableDepTrack=1; " | |||
| "[ -e $stdenv/setup ] && source $stdenv/setup; " | |||
| "%3%" | |||
| "PATH=\"$(dirname %4%):$PATH\"; " | |||
There was a problem hiding this comment.
This can be PATH=%N% where N = dirOf(shell). I.e. compute the directory in C++, saving an external call.
|
Arguably this reduces |
grahamc
force-pushed
the
add-interactive-path
branch
from
fd9ebe9
to
57e1c4e
Compare
|
It does, and it is a bit annoying that it makes it harder to override the shell. I'm not aware of a nice alternative which also keeps things consistently working. |
edolstra
reviewed
Sep 27, 2018
src/nix-build/nix-build.cc
Outdated
| @@ -417,16 +417,19 @@ void mainWrapped(int argc, char * * argv) | |||
| "dontAddDisableDepTrack=1; " | |||
| "[ -e $stdenv/setup ] && source $stdenv/setup; " | |||
| "%3%" | |||
| "PATH=\"%4%:$PATH\"; " | |||
| "SHELL=%4%; " | |||
There was a problem hiding this comment.
Probably PATH and SHELL shouldn't both refer to %4%?
There was a problem hiding this comment.
SHELL=/nix/store/pd3xx55jjik53gvbyrs4h0him03l3wah-bash-interactive-4.4-p23/bin/bash
PATH=/nix/store/pd3xx55jjik53gvbyrs4h0him03l3wah-bash-interactive-4.4-p23/bin:...
Tools which re-exec `$SHELL` or `$0` or `basename $SHELL` or even just `bash` will otherwise get the non-interactive bash, providing a broken shell for the same reasons described in NixOS/nixpkgs#27493. Extends c94f3d5
grahamc
force-pushed
the
add-interactive-path
branch
from
57e1c4e
to
f11acba
Compare
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.
Tools which re-exec
$SHELLor$0orbasename $SHELLor even justbashwill otherwise get the non-interactive bash, providing abroken shell for the same reasons described in
NixOS/nixpkgs#27493.
Extends c94f3d5