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

nixos: inline set-environment for bash and zsh
2018-03-08 21:07:15 +01:00
parent 697847bfe3 b00a3fc6fd
commit db6fb869fb
2 changed files with 2 additions and 2 deletions
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -126,7 +126,7 @@ in
    programs.bash = {

      shellInit = ''
-        . ${config.system.build.setEnvironment}
+        ${config.system.build.setEnvironment.text}

        ${cfge.shellInit}
      '';
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -108,7 +108,7 @@ in
        if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
        export __ETC_ZSHENV_SOURCED=1

-        . ${config.system.build.setEnvironment}
+        ${config.system.build.setEnvironment.text}

        ${cfge.shellInit}