diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-10-29 11:32:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-29 11:32:10 +0000 |
| commit | 2412c7f9f98377680418625a3aa7b685b2403107 (patch) | |
| tree | 0d6fb0286dede2e7cc2c770675009df05bf434e7 /modules/programs/bash | |
| parent | 34a6eca0333deb13e52099f6b528d0b9cecd6e83 (diff) | |
| parent | b5fc279d1b6140ba826ab4438cac368d02841755 (diff) | |
Merge pull request #111 from thefloweringash/shell-child-env
Unify environment configuration and don't run in child shells
Diffstat (limited to 'modules/programs/bash')
| -rw-r--r-- | modules/programs/bash/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/programs/bash/default.nix b/modules/programs/bash/default.nix index ea5afe2..6f5c8e7 100644 --- a/modules/programs/bash/default.nix +++ b/modules/programs/bash/default.nix @@ -61,8 +61,9 @@ in # Don't execute this file when running in a pure nix-shell. if test -n "$IN_NIX_SHELL"; then return; fi - export PATH=${config.environment.systemPath} - ${config.system.build.setEnvironment.text} + if [ -z "$__NIX_DARWIN_SET_ENVIRONMENT_DONE" ]; then + . ${config.system.build.setEnvironment} + fi # Return early if not running interactively, but after basic nix setup. [[ $- != *i* ]] && return |