diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-10-07 12:39:47 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-10-07 12:41:33 +0200 |
| commit | e8355cdd938c85b86024d22bd44ed7e3c939e17b (patch) | |
| tree | 024a3754d1494e3a29ba937e31d09e4715338ce2 /modules/programs | |
| parent | a8b47702751e5f53448c65ba1655747a88714445 (diff) | |
system-build: change type of setEnvironment and setAliases
On NixOS system.build.setEnvironment also is a writeText
Diffstat (limited to 'modules/programs')
| -rw-r--r-- | modules/programs/bash.nix | 4 | ||||
| -rw-r--r-- | modules/programs/fish.nix | 2 | ||||
| -rw-r--r-- | modules/programs/zsh/default.nix | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix index 0c2ce6d..dc58af4 100644 --- a/modules/programs/bash.nix +++ b/modules/programs/bash.nix @@ -73,8 +73,8 @@ in __ETC_BASHRC_SOURCED=1 export PATH=${config.environment.systemPath} - ${config.system.build.setEnvironment} - ${config.system.build.setAliases} + ${config.system.build.setEnvironment.text} + ${config.system.build.setAliases.text} ${config.environment.interactiveShellInit} ${cfg.interactiveShellInit} diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix index d5c0f44..c7362f1 100644 --- a/modules/programs/fish.nix +++ b/modules/programs/fish.nix @@ -9,7 +9,7 @@ let foreignEnv = pkgs.writeText "fish-foreign-env" '' # TODO: environment.shellInit - ${config.system.build.setEnvironment} + ${config.system.build.setEnvironment.text} ''; loginForeignEnv = pkgs.writeText "fish-login-foreign-env" '' diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix index 9fbefca..0c873de 100644 --- a/modules/programs/zsh/default.nix +++ b/modules/programs/zsh/default.nix @@ -130,7 +130,7 @@ in if test -n "$IN_NIX_SHELL"; then return; fi export PATH=${config.environment.systemPath} - ${config.system.build.setEnvironment} + ${config.system.build.setEnvironment.text} ${cfg.shellInit} @@ -149,7 +149,7 @@ in __ETC_ZPROFILE_SOURCED=1 ${concatStringsSep "\n" zshVariables} - ${config.system.build.setAliases} + ${config.system.build.setAliases.text} ${cfg.loginShellInit} |