aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRobert Helgesson <robert@rycee.net>2019-08-22 08:35:06 +0200
committerRobert Helgesson <robert@rycee.net>2019-08-22 08:35:06 +0200
commiteb1b86a5ec7baf1a1ce2c277d568a8751c24a7ee (patch)
tree1c630be7a36013bf2f0481745ad0634dfd9d26b3 /modules
parent7159c293af3362370159da45fdb1ac0b0b7c373c (diff)
Replace use of `stdenv.shell` by `runtimeShell`
Diffstat (limited to 'modules')
-rw-r--r--modules/home-environment.nix2
-rw-r--r--modules/programs/notmuch.nix2
-rw-r--r--modules/services/emacs.nix2
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/home-environment.nix b/modules/home-environment.nix
index 7f51cd8a3df..4b14d2d40d7 100644
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -370,7 +370,7 @@ in
+ optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH";
activationScript = pkgs.writeScript "activation-script" ''
- #!${pkgs.stdenv.shell}
+ #!${pkgs.runtimeShell}
set -eu
set -o pipefail
diff --git a/modules/programs/notmuch.nix b/modules/programs/notmuch.nix
index e39747c8bab..cd0b1384ad9 100644
--- a/modules/programs/notmuch.nix
+++ b/modules/programs/notmuch.nix
@@ -188,7 +188,7 @@ in
{
target = "${notmuchIni.database.path}/.notmuch/hooks/${name}";
source = pkgs.writeScript name ''
- #!${pkgs.stdenv.shell}
+ #!${pkgs.runtimeShell}
export PATH="${pkgs.notmuch}/bin''${PATH:+:}$PATH"
export NOTMUCH_CONFIG="${config.xdg.configHome}/notmuch/notmuchrc"
diff --git a/modules/services/emacs.nix b/modules/services/emacs.nix
index 216645475a9..33d6871c61b 100644
--- a/modules/services/emacs.nix
+++ b/modules/services/emacs.nix
@@ -35,7 +35,7 @@ in
};
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)'";
Restart = "on-failure";
};