eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-23 11:39:46 +01:00
Code Issues Releases Wiki Activity

Replace use of stdenv.shell by runtimeShell

Browse source
This commit is contained in:
Robert Helgesson 2019-08-22 08:35:06 +02:00
parent 7159c293af
commit eb1b86a5ec
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/home-environment.nix
View file

@ -370,7 +370,7 @@ in
+ optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH"; + optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH";
activationScript = pkgs.writeScript "activation-script" '' activationScript = pkgs.writeScript "activation-script" ''
#!${pkgs.stdenv.shell} #!${pkgs.runtimeShell}
set -eu set -eu
set -o pipefail set -o pipefail

2
modules/programs/notmuch.nix
View file

@ -188,7 +188,7 @@ in
{ {
target = "${notmuchIni.database.path}/.notmuch/hooks/${name}"; target = "${notmuchIni.database.path}/.notmuch/hooks/${name}";
source = pkgs.writeScript name '' source = pkgs.writeScript name ''
#!${pkgs.stdenv.shell} #!${pkgs.runtimeShell}
export PATH="${pkgs.notmuch}/bin''${PATH:+:}$PATH" export PATH="${pkgs.notmuch}/bin''${PATH:+:}$PATH"
export NOTMUCH_CONFIG="${config.xdg.configHome}/notmuch/notmuchrc" export NOTMUCH_CONFIG="${config.xdg.configHome}/notmuch/notmuchrc"

2
modules/services/emacs.nix
View file

@ -35,7 +35,7 @@ in
}; };
Service = { Service = {
ExecStart = "${pkgs.stdenv.shell} -l -c 'exec ${emacsBinPath}/emacs --fg-daemon'"; ExecStart = "${pkgs.runtimeShell} -l -c 'exec ${emacsBinPath}/emacs --fg-daemon'";
ExecStop = "${emacsBinPath}/emacsclient --eval '(kill-emacs)'"; ExecStop = "${emacsBinPath}/emacsclient --eval '(kill-emacs)'";
Restart = "on-failure"; Restart = "on-failure";
}; };

2
nixos/default.nix
View file

@ -108,7 +108,7 @@ in
# The activation script is run by a login shell to make sure # The activation script is run by a login shell to make sure
# that the user is given a sane Nix environment. # that the user is given a sane Nix environment.
ExecStart = pkgs.writeScript "activate-${username}" '' ExecStart = pkgs.writeScript "activate-${username}" ''
#! ${pkgs.stdenv.shell} -el #! ${pkgs.runtimeShell} -el
echo Activating home-manager configuration for ${username} echo Activating home-manager configuration for ${username}
exec ${usercfg.home.activationPackage}/activate exec ${usercfg.home.activationPackage}/activate
''; '';