suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request #30418 from LnL7/inline-set-environment

Browse Source 
nixos: inline set-environment for bash and zsh
This commit is contained in:
Daiderd Jordan 2018-03-08 21:07:15 +01:00 committed by GitHub
commit db6fb869fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/programs/bash/bash.nix
View File

@ -126,7 +126,7 @@ in
programs.bash = { programs.bash = {
shellInit = '' shellInit = ''
. ${config.system.build.setEnvironment} ${config.system.build.setEnvironment.text}
${cfge.shellInit} ${cfge.shellInit}
''; '';

2
nixos/modules/programs/zsh/zsh.nix
View File

@ -108,7 +108,7 @@ in
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1 export __ETC_ZSHENV_SOURCED=1
. ${config.system.build.setEnvironment} ${config.system.build.setEnvironment.text}
${cfge.shellInit} ${cfge.shellInit}