about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2017-10-14 21:19:07 +0200
committerDaiderd Jordan <daiderd@gmail.com>2017-10-14 21:19:07 +0200
commitb00a3fc6fd82834114771f2115a2b032f0ebfe29 (patch)
tree89fc00fe728afb6ecee621b600aa5fa4b41bac28
parent0f01f8b882627b063f00722a2a8985fcfe6a82cf (diff)
downloadnixlib-b00a3fc6fd82834114771f2115a2b032f0ebfe29.tar
nixlib-b00a3fc6fd82834114771f2115a2b032f0ebfe29.tar.gz
nixlib-b00a3fc6fd82834114771f2115a2b032f0ebfe29.tar.bz2
nixlib-b00a3fc6fd82834114771f2115a2b032f0ebfe29.tar.lz
nixlib-b00a3fc6fd82834114771f2115a2b032f0ebfe29.tar.xz
nixlib-b00a3fc6fd82834114771f2115a2b032f0ebfe29.tar.zst
nixlib-b00a3fc6fd82834114771f2115a2b032f0ebfe29.zip
nixos: inline set-environment for bash and zsh
-rw-r--r--nixos/modules/programs/bash/bash.nix2
-rw-r--r--nixos/modules/programs/zsh/zsh.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index e23849d350b4..26b00fb389e1 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -123,7 +123,7 @@ in
     programs.bash = {
 
       shellInit = ''
-        . ${config.system.build.setEnvironment}
+        ${config.system.build.setEnvironment.text}
 
         ${cfge.shellInit}
       '';
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 615e54c326b7..97c2d14a2fd5 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -107,7 +107,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}