commit db6fb869fbf70f38de4170edf49f0e7fbabd69b3 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

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

nixos: inline set-environment for bash and zsh

authored by Daiderd Jordan and committed by GitHub 7 years ago db6fb869 697847bf

+2 -2

2 changed files

expand all

unified split

nixos

modules

programs

bash

bash.nix

zsh

zsh.nix

+1 -1

nixos/modules/programs/bash/bash.nix

··· 126 126 programs.bash = { 127 127 128 128 shellInit = '' 129 - . ${config.system.build.setEnvironment} 129 + ${config.system.build.setEnvironment.text} 130 130 131 131 ${cfge.shellInit} 132 132 '';

+1 -1

nixos/modules/programs/zsh/zsh.nix

··· 108 108 if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi 109 109 export __ETC_ZSHENV_SOURCED=1 110 110 111 - . ${config.system.build.setEnvironment} 111 + ${config.system.build.setEnvironment.text} 112 112 113 113 ${cfge.shellInit} 114 114