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}
od='get' action='/guix/log/gnu/packages/valgrind.scm'>
<input type='hidden' name='id' value='54e88d8da5ee1c0591b106b63e1c9437967ab52c'/><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=54e88d8da5ee1c0591b106b63e1c9437967ab52c'>root</a>/<a href='/guix/log/gnu?id=54e88d8da5ee1c0591b106b63e1c9437967ab52c'>gnu</a>/<a href='/guix/log/gnu/packages?id=54e88d8da5ee1c0591b106b63e1c9437967ab52c'>packages</a>/<a href='/guix/log/gnu/packages/valgrind.scm?id=54e88d8da5ee1c0591b106b63e1c9437967ab52c'>valgrind.scm</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/valgrind.scm?id=54e88d8da5ee1c0591b106b63e1c9437967ab52c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-05-25 09:45:02 +0100'>2023-05-25</span></td><td><a href='/guix/commit/gnu/packages/valgrind.scm?id=e5184ba4349a66db24c5723c5a29befca6bcd338'>gnu: valgrind: Mark as not supported for armhf-linux.</a><span class='msg-avail'>...<span class='msg-tooltip'>From the build log:
  checking for a supported CPU... no (arm)
  configure: error: Unsupported host architecture. Sorry

* gnu/packages/valgrind.scm (valgrind)[supported-systems]: Remove armhf-linux.
</span></span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2023-04-26 14:34:23 +0200'>2023-04-26</span></td><td><a href='/guix/commit/gnu/packages/valgrind.scm?id=c3509c2148ee74b66a7e4338c626cd3b582ab51c'>gnu: valgrind: Update to 3.20.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/valgrind.scm (valgrind): Update to 3.20.0. Remove patch.
[arguments]&lt;phases&gt;: Remove trailing #t.
* gnu/packages/patches/valgrind-enable-arm.patch: Delete file.
* gnu/packages/valgrind.scm (dist_patch_DATA): Unregister patch.

Signed-off-by: Andreas Enge &lt;andreas@enge.fr&gt;
</span></span></td><td>zimoun</td></tr>