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}
e9a0f783320952a8fc'>commit</a><a href='/guix/diff/gnu/packages/patches/rust-ndarray-0.14-remove-blas-src.patch?id=ca7e310f7ac32354b2e693e9a0f783320952a8fc'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/rust-ndarray-0.14-remove-blas-src.patch'>
<input type='hidden' name='id' value='ca7e310f7ac32354b2e693e9a0f783320952a8fc'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=ca7e310f7ac32354b2e693e9a0f783320952a8fc'>root</a>/<a href='/guix/log/gnu?id=ca7e310f7ac32354b2e693e9a0f783320952a8fc'>gnu</a>/<a href='/guix/log/gnu/packages?id=ca7e310f7ac32354b2e693e9a0f783320952a8fc'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=ca7e310f7ac32354b2e693e9a0f783320952a8fc'>patches</a>/<a href='/guix/log/gnu/packages/patches/rust-ndarray-0.14-remove-blas-src.patch?id=ca7e310f7ac32354b2e693e9a0f783320952a8fc'>rust-ndarray-0.14-remove-blas-src.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/rust-ndarray-0.14-remove-blas-src.patch?id=ca7e310f7ac32354b2e693e9a0f783320952a8fc&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-04-03 14:07:48 +0300'>2022-04-03</span></td><td><a href='/guix/commit/gnu/packages/patches/rust-ndarray-0.14-remove-blas-src.patch?id=8b54123a9dc218365048f2a9ae56c1664dd7ab45'>gnu: Add rust-ndarray-0.14.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/crates-io.scm (rust-ndarray-0.14): New variable.
* gnu/packages/patches/rust-ndarray-0.14-remove-blas-src.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
</span></span></td><td>Efraim Flashner</td></tr>