b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

emacsWithPackages: fix logic of adding EMACSNATIVELOADPATH

Browse source 
Without this change, EMACSNATIVELOADPATH will not be added if
EMACSLOADPATH is added.
This commit is contained in:
Lin Jian 2023-08-25 10:30:25 +08:00 committed by Anderson Torres
parent a12258c461
commit d380784357
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/build-support/emacs/wrapper.sh
View file

@ -4,16 +4,17 @@ IFS=:
newLoadPath=() newLoadPath=()
newNativeLoadPath=() newNativeLoadPath=()
added= addedNewLoadPath=
addedNewNativeLoadPath=
if [[ -n $EMACSLOADPATH ]] if [[ -n $EMACSLOADPATH ]]
then then
while read -rd: entry while read -rd: entry
do do
if [[ -z $entry && -z $added ]] if [[ -z $entry && -z $addedNewLoadPath ]]
then then
newLoadPath+=(@wrapperSiteLisp@) newLoadPath+=(@wrapperSiteLisp@)
added=1 addedNewLoadPath=1
fi fi
newLoadPath+=("$entry") newLoadPath+=("$entry")
done <<< "$EMACSLOADPATH:" done <<< "$EMACSLOADPATH:"
@ -26,10 +27,10 @@ if [[ -n $EMACSNATIVELOADPATH ]]
then then
while read -rd: entry while read -rd: entry
do do
if [[ -z $entry && -z $added ]] if [[ -z $entry && -z $addedNewNativeLoadPath ]]
then then
newNativeLoadPath+=(@wrapperSiteLispNative@) newNativeLoadPath+=(@wrapperSiteLispNative@)
added=1 addedNewNativeLoadPath=1
fi fi
newNativeLoadPath+=("$entry") newNativeLoadPath+=("$entry")
done <<< "$EMACSNATIVELOADPATH:" done <<< "$EMACSNATIVELOADPATH:"