dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

emacs package setup hook: Fix

Browse Source 
1. Make the test more robust

2. EMACSLOADPATH may be initially undefined.

3. did `targetOffset` twice when meant `hostOffset` too
This commit is contained in:
John Ericson 2019-11-07 18:24:49 -05:00
parent f1481f2c90
commit ca782498a9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/emacs/setup-hook.sh
View File

@ -1,11 +1,11 @@
addEmacsVars () { addEmacsVars () {
if test -d $1/share/emacs/site-lisp; then if [[ -d "$1/share/emacs/site-lisp" ]]; then
export EMACSLOADPATH="$1/share/emacs/site-lisp:$EMACSLOADPATH" export EMACSLOADPATH="$1/share/emacs/site-lisp${EMACSLOADPATH:+:}${EMACSLOADPATH-}"
fi fi
} }
# If this is for a wrapper derivation, emacs and the dependencies are all # If this is for a wrapper derivation, emacs and the dependencies are all
# run-time dependencies. If this is for precompiling packages into bytecode, # run-time dependencies. If this is for precompiling packages into bytecode,
# emacs is a compile-time dependency of the package. # emacs is a compile-time dependency of the package.
addEnvHooks "$targetOffset" addEmacsVars addEnvHooks "$hostOffset" addEmacsVars
addEnvHooks "$targetOffset" addEmacsVars addEnvHooks "$targetOffset" addEmacsVars