blob: 5f759a66d9725fa9f175ca1fd7a83eec6ffb5edb (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
This patch changes the default value of 'dict-dir' to correspond
to ~/.guix-profile/lib/aspell rather than $prefix/lib/aspell-X.Y.
This is not strictly necessary for the 'aspell' program itself since
one can simply set "ASPELL_CONF=dict-dir $HOME/.guix-profile/lib/aspell".
However it is necessary for applications that use libaspell since
'ASPELL_CONF' is not honored in this case. See <https://bugs.gnu.org/25836>.
--- a/common/config.cpp
+++ b/common/config.cpp
@@ -651,7 +651,20 @@ namespace acommon {
} else { // sep == '|'
assert(replace[0] == '$');
const char * env = getenv(replace.c_str()+1);
- final_str += env ? env : second;
+ if (env) {
+ final_str += env;
+ } else if (second[0] == '$') {
+ // Expand the right-hand side of '|', which starts with a
+ // reference to an environment variable.
+ auto slash = second.find('/');
+ String variable = second.substr(1, slash - 1);
+ const char * env = getenv(variable.c_str());
+ String value = env ? String(env) : "";
+ value += second.substr(slash, second.size() - slash);
+ final_str += value;
+ } else {
+ final_str += second;
+ }
}
replace = "";
in_replace = false;
@@ -1349,6 +1349,9 @@ namespace acommon {
# define REPL ".aspell.<lang>.prepl"
#endif
+#undef DICT_DIR
+#define DICT_DIR "<$ASPELL_DICT_DIR|$HOME/.guix-profile/lib/aspell>"
+
static const KeyInfo config_keys[] = {
// the description should be under 50 chars
{"actual-dict-dir", KeyInfoString, "<dict-dir^master>", 0}
|
