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}
4f2147770e31'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/build-self.scm'>
<input type='hidden' name='id' value='f673e713c0d16d2cf767400a91034f2147770e31'/><input type='hidden' name='showmsg' value='1'/><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=f673e713c0d16d2cf767400a91034f2147770e31&amp;ofs=50&amp;showmsg=1'>root</a>/<a href='/guix/log/build-aux?id=f673e713c0d16d2cf767400a91034f2147770e31&amp;ofs=50&amp;showmsg=1'>build-aux</a>/<a href='/guix/log/build-aux/build-self.scm?id=f673e713c0d16d2cf767400a91034f2147770e31&amp;ofs=50&amp;showmsg=1'>build-self.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/build-aux/build-self.scm?id=f673e713c0d16d2cf767400a91034f2147770e31&amp;ofs=50'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2017-08-02 00:04:00 +0200'>2017-08-02</span></td><td class='logsubject'><a href='/guix/commit/build-aux/build-self.scm?id=59a16275189f55ddd692b0ea5b415c706fa1fd69'>pull: Fetch source code from Git.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/scripts/pull.scm (%snapshot-url, with-environment-variable)
(with-PATH): Remove.
(ensure-guile-git!): New procedure.
(%repository-url): New variable.
(%default-options): Add 'repository-url' and 'ref'.
(show-help, %options): Add '--commit' and '--url'.
(temporary-directory, first-directory, interned-then-deleted)
(unpack): Remove.
(build-from-source): Rename 'tarball' to 'source'.  Remove call to
'unpack'.
(build-and-install): Rename 'tarball' to 'source'.
(honor-lets-encrypt-certificates!, report-git-error): New procedures.
(with-git-error-handling): New macro.
(guix-pull)[fetch-tarball]: Remove.
Wrap body in 'with-git-error-handling'.  Rewrite to use
'latest-repository-commit'.
* build-aux/build-self.scm (build): Print an error message and exit when
GUILE-GIT is #f.
* doc/guix.texi (Invoking guix pull): Mention Git.  Document '--commit'
and '--branch'.


</td></tr>
<tr class='logheader'><td><span title='2017-06-09 09:48:26 +0200'>2017-06-09</span></td><td class='logsubject'><a href='/guix/commit/build-aux/build-self.scm?id=19c90e5f697bbf1be5ea3a7b4f5fe712d77070a1'>pull: Add a dependency to guile-git.</a></td><td>Mathieu Othacehe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* build-aux/build-self.scm (guile-git, guile-bytestructures): New
  variables.
  (build): Add guile-git and guile-bytestructures to %load-path and
  %load-compiled-path.


</td></tr>
<tr class='logheader'><td><span title='2017-05-09 18:08:24 +0200'>2017-05-09</span></td><td class='logsubject'><a href='/guix/commit/build-aux/build-self.scm?id=838ba73d6e49bd2b1f2d4ed9329b65cc4e8c1f54'>pull: Build with the matching Guile major version.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Previously, 'guix pull' would always build with Guile 2.0.
Now it builds with the Guile that matches (effective-version).

* build-aux/build-self.scm (false-if-wrong-guile)
(package-for-current-guile): New procedures.
(guile-json, guile-ssh): Use it.
(guile-for-build): New procedure.
(build): Use (effective-version) instead of the hard-coded "/2.0".
Add (guix modules) closure to #:modules argument.  Pass
\#:guile-for-build argument to 'gexp-&gt;derivation'.
* guix/build/pull.scm (depends-on-guile-ssh?, all-scheme-files): New
procedures.
(build-guix): Show the output of (version).  Use the above procedures.
Filter out files that match 'depends-on-guile-ssh?' when (ssh session)
is missing.


</td></tr>