diff options
| author | Tad Fisher <tadfisher@gmail.com> | 2020-06-23 17:17:33 -0700 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2020-06-24 22:50:30 +0200 |
| commit | 54b69d2ef868783533ce9c581cab7f0252b37149 (patch) | |
| tree | 0842a082025f4e1f2f040f701edcc2c6584a7813 /tests/modules/services/emacs | |
| parent | 8f2342e13a2ddc84ed5053e2bfc393184258c686 (diff) | |
emacs: fix service environment
Emacs populates 'exec-path' at launch from the 'PATH' environment
variable. Likewise, the emacs derivation from nixpkgs populates
'load-path' from the 'NIX_PROFILES' variable. As neither of these are
available by default in the systemd user manager, revert to the
previous behavior of launching the Emacs daemon from a login shell.
Fixes #1354
Fixes #1340
PR #1355
Diffstat (limited to 'tests/modules/services/emacs')
6 files changed, 21 insertions, 6 deletions
diff --git a/tests/modules/services/emacs/emacs-service-emacs.service b/tests/modules/services/emacs/emacs-service-emacs.service index c862e5688c6..d8a618a2671 100644 --- a/tests/modules/services/emacs/emacs-service-emacs.service +++ b/tests/modules/services/emacs/emacs-service-emacs.service @@ -2,7 +2,7 @@ WantedBy=default.target [Service] -ExecStart=@emacs@/bin/emacs --fg-daemon +ExecStart=@runtimeShell@ -l -c "@emacs@/bin/emacs --fg-daemon" ExecStop=@emacs@/bin/emacsclient --eval '(kill-emacs 0)' Restart=on-failure diff --git a/tests/modules/services/emacs/emacs-service.nix b/tests/modules/services/emacs/emacs-service.nix index 06a26c82309..be27e9ab33d 100644 --- a/tests/modules/services/emacs/emacs-service.nix +++ b/tests/modules/services/emacs/emacs-service.nix @@ -24,7 +24,12 @@ with lib; assertFileExists home-path/share/applications/emacsclient.desktop assertFileContent home-files/.config/systemd/user/emacs.service \ - ${./emacs-service-emacs.service} + ${ + pkgs.substituteAll { + inherit (pkgs) runtimeShell; + src = ./emacs-service-emacs.service; + } + } assertFileContent home-path/share/applications/emacsclient.desktop \ ${./emacs-emacsclient.desktop} ''; diff --git a/tests/modules/services/emacs/emacs-socket-26-emacs.service b/tests/modules/services/emacs/emacs-socket-26-emacs.service index 8e9daba80d7..2d731c7ee1a 100644 --- a/tests/modules/services/emacs/emacs-socket-26-emacs.service +++ b/tests/modules/services/emacs/emacs-socket-26-emacs.service @@ -1,5 +1,5 @@ [Service] -ExecStart=@emacs@/bin/emacs --fg-daemon="%T/emacs%U/server" +ExecStart=@runtimeShell@ -l -c "@emacs@/bin/emacs --fg-daemon='%T/emacs%U/server'" ExecStop=@emacs@/bin/emacsclient --eval '(kill-emacs 0)' Restart=on-failure diff --git a/tests/modules/services/emacs/emacs-socket-26.nix b/tests/modules/services/emacs/emacs-socket-26.nix index 7905e19b346..65f06159e4c 100644 --- a/tests/modules/services/emacs/emacs-socket-26.nix +++ b/tests/modules/services/emacs/emacs-socket-26.nix @@ -27,7 +27,12 @@ with lib; assertFileContent home-files/.config/systemd/user/emacs.socket \ ${./emacs-socket-26-emacs.socket} assertFileContent home-files/.config/systemd/user/emacs.service \ - ${./emacs-socket-26-emacs.service} + ${ + pkgs.substituteAll { + inherit (pkgs) runtimeShell; + src = ./emacs-socket-26-emacs.service; + } + } assertFileContent home-path/share/applications/emacsclient.desktop \ ${./emacs-emacsclient.desktop} ''; diff --git a/tests/modules/services/emacs/emacs-socket-27-emacs.service b/tests/modules/services/emacs/emacs-socket-27-emacs.service index 99bacf2903b..408a5d24b5c 100644 --- a/tests/modules/services/emacs/emacs-socket-27-emacs.service +++ b/tests/modules/services/emacs/emacs-socket-27-emacs.service @@ -1,5 +1,5 @@ [Service] -ExecStart=@emacs@/bin/emacs --fg-daemon="%t/emacs/server" +ExecStart=@runtimeShell@ -l -c "@emacs@/bin/emacs --fg-daemon='%t/emacs/server'" ExecStop=@emacs@/bin/emacsclient --eval '(kill-emacs 0)' Restart=on-failure diff --git a/tests/modules/services/emacs/emacs-socket-27.nix b/tests/modules/services/emacs/emacs-socket-27.nix index d1ecb954a78..213dedca51c 100644 --- a/tests/modules/services/emacs/emacs-socket-27.nix +++ b/tests/modules/services/emacs/emacs-socket-27.nix @@ -29,7 +29,12 @@ in { assertFileContent home-files/.config/systemd/user/emacs.socket \ ${./emacs-socket-27-emacs.socket} assertFileContent home-files/.config/systemd/user/emacs.service \ - ${./emacs-socket-27-emacs.service} + ${ + pkgs.substituteAll { + inherit (pkgs) runtimeShell; + src = ./emacs-socket-27-emacs.service; + } + } assertFileContent home-path/share/applications/emacsclient.desktop \ ${./emacs-emacsclient.desktop} ''; |