From 81fc64da7e9fa5eed782d0c52ebd5c76598e045a Mon Sep 17 00:00:00 2001
From: Federico Beffa <beffa@fbengineering.ch>
Date: Fri, 8 Jan 2016 14:23:12 +0100
Subject: [PATCH] gnu: aspell: Wrap binary to find dictionaries.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/aspell.scm (aspell): Add 'wrap-aspell' phase.
* gnu/system.scm (operating-system-etc-service): Remove 'ASPELL_CONF'
definition.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/aspell.scm | 10 ++++++++++
 gnu/system.scm          |  3 ---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm
index 2425d1cbec..ede217078f 100644
--- a/gnu/packages/aspell.scm
+++ b/gnu/packages/aspell.scm
@@ -38,6 +38,16 @@
        (base32
         "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'wrap-aspell
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((bin/aspell (string-append (assoc-ref outputs "out")
+                                              "/bin/aspell")))
+               (wrap-program bin/aspell
+                 '("ASPELL_CONF" "" =
+                   ("${ASPELL_CONF:-\"dict-dir ${GUIX_PROFILE:-$HOME/.guix-profile}/lib/aspell\"}")))))))))
     (inputs `(("perl" ,perl)))
     (home-page "http://aspell.net/")
     (synopsis "Spell checker")
diff --git a/gnu/system.scm b/gnu/system.scm
index b4264fe5f8..76a9f1ffa3 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -465,9 +465,6 @@ else
   export PATH=\"$HOME/.guix-profile/bin:$PATH\"
 fi
 
-# Allow Aspell to find dictionaries installed in the user profile.
-export ASPELL_CONF=\"dict-dir $HOME/.guix-profile/lib/aspell\"
-
 # Allow GStreamer-based applications to find plugins.
 export GST_PLUGIN_PATH=\"$HOME/.guix-profile/lib/gstreamer-1.0\"