public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25835 from therealpxc/fish

Browse Source 
Fish: source NixOS environment on non-login shells + source shell init on NixOS even when parent shell has done so
This commit is contained in:
Jörg Thalheim
2017-05-22 07:08:30 +01:00
committed by GitHub
parent c3f434fd62 42c768c8e8
commit 7e40287d00
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/shells/fish/default.nix
View File

@@ -45,10 +45,15 @@ let
'';
fishPreInitHooks = ''
# source nixos environment if we're a login shell
# source nixos environment
# note that this is required:
# 1. For all shells, not just login shells (mosh needs this as do some other command-line utilities)
# 2. Before the shell is initialized, so that config snippets can find the commands they use on the PATH
builtin status --is-login
or test -z "$__fish_nixos_env_preinit_sourced" -a -z "$ETC_PROFILE_SOURCED" -a -z "$ETC_ZSHENV_SOURCED"
and test -f /etc/fish/nixos-env-preinit.fish
and source /etc/fish/nixos-env-preinit.fish
and set -gx __fish_nixos_env_preinit_sourced 1
test -n "$NIX_PROFILES"
and begin