diff options
| author | Herwig Hochleitner <herwig@bendlas.net> | 2019-11-23 19:41:24 +0100 |
|---|---|---|
| committer | Herwig Hochleitner <herwig@bendlas.net> | 2019-11-23 19:49:56 +0100 |
| commit | 42eeca722c375766d15bfc57f97bfb99bceaf8ac (patch) | |
| tree | ebc7838b7af9e910adeb94f99435fc6800276a63 /pkgs/build-support/emacs | |
| parent | c3a0db00aa2f3530389f359e99f3c711cc8881f5 (diff) | |
| download | nixpkgs-42eeca722c375766d15bfc57f97bfb99bceaf8ac.tar nixpkgs-42eeca722c375766d15bfc57f97bfb99bceaf8ac.tar.gz nixpkgs-42eeca722c375766d15bfc57f97bfb99bceaf8ac.tar.bz2 nixpkgs-42eeca722c375766d15bfc57f97bfb99bceaf8ac.tar.lz nixpkgs-42eeca722c375766d15bfc57f97bfb99bceaf8ac.tar.xz nixpkgs-42eeca722c375766d15bfc57f97bfb99bceaf8ac.tar.zst nixpkgs-42eeca722c375766d15bfc57f97bfb99bceaf8ac.zip | |
emacs package setup hook: Fix Fix
A trailing separator in emacs load paths has semantics cc @Ericson2314 @adisbladis https://github.com/NixOS/nixpkgs/pull/73287 This partially reverts commit ca782498a9532c48d8e12ce402813486ab90e7f0
Diffstat (limited to 'pkgs/build-support/emacs')
| -rw-r--r-- | pkgs/build-support/emacs/setup-hook.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/build-support/emacs/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh index b55c1873802..b210511d670 100644 --- a/pkgs/build-support/emacs/setup-hook.sh +++ b/pkgs/build-support/emacs/setup-hook.sh @@ -1,6 +1,8 @@ addEmacsVars () { - if [[ -d "$1/share/emacs/site-lisp" ]]; then - export EMACSLOADPATH="$1/share/emacs/site-lisp${EMACSLOADPATH:+:}${EMACSLOADPATH-}" + if test -d $1/share/emacs/site-lisp; then + # it turns out, that the trailing : is actually required + # see https://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Search.html + export EMACSLOADPATH="$1/share/emacs/site-lisp:${EMACSLOADPATH-}" fi } |