pyrox.dev
emacsWithPackages: fix logic of adding EMACSNATIVELOADPATH
Without this change, EMACSNATIVELOADPATH will not be added if
EMACSLOADPATH is added.
authored by Lin Jian and committed by Anderson Torres d3807843 a12258c4
+6
-5
pkgs/build-support/emacs/wrapper.sh
+6
-5
pkgs/build-support/emacs/wrapper.sh
···
4
4
5
5
newLoadPath=()
6
6
newNativeLoadPath=()
7
-
added=
7
+
addedNewLoadPath=
8
+
addedNewNativeLoadPath=
8
9
9
10
if [[ -n $EMACSLOADPATH ]]
10
11
then
11
12
while read -rd: entry
12
13
do
13
-
if [[ -z $entry && -z $added ]]
14
+
if [[ -z $entry && -z $addedNewLoadPath ]]
14
15
then
15
16
newLoadPath+=(@wrapperSiteLisp@)
16
-
added=1
17
+
addedNewLoadPath=1
17
18
fi
18
19
newLoadPath+=("$entry")
19
20
done <<< "$EMACSLOADPATH:"
···
26
27
then
27
28
while read -rd: entry
28
29
do
29
-
if [[ -z $entry && -z $added ]]
30
+
if [[ -z $entry && -z $addedNewNativeLoadPath ]]
30
31
then
31
32
newNativeLoadPath+=(@wrapperSiteLispNative@)
32
-
added=1
33
+
addedNewNativeLoadPath=1
33
34
fi
34
35
newNativeLoadPath+=("$entry")
35
36
done <<< "$EMACSNATIVELOADPATH:"