From b00a3fc6fd82834114771f2115a2b032f0ebfe29 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 14 Oct 2017 21:19:07 +0200 Subject: [PATCH] nixos: inline set-environment for bash and zsh --- nixos/modules/programs/bash/bash.nix | 2 +- nixos/modules/programs/zsh/zsh.nix | 2 +- 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}