diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-04-22 23:15:47 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-04-23 00:03:17 +0200 |
| commit | ed9fb46b16cf7632e6df15c52c7183807fe5d1f9 (patch) | |
| tree | e1bdc07ffbe34de79280f34d2abbedc9c88e1516 | |
| parent | ab2419e56ad3a8c1e4eec7d9b456586b12b04efd (diff) | |
| download | patches-ed9fb46b16cf7632e6df15c52c7183807fe5d1f9.tar patches-ed9fb46b16cf7632e6df15c52c7183807fe5d1f9.tar.gz | |
gnu: emacs-guix: Adjust to both 2.2 and 2.0.
* gnu/packages/emacs.scm (emacs-guix)[arguments]: In #:configure-flags,
use 'find-files' to determine the --with-guix-site-dir argument.
| -rw-r--r-- | gnu/packages/emacs.scm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 746c7af529..47ea8d43a1 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1406,7 +1406,13 @@ type, for example: packages, buffers, files, etc.") (magit-popup (assoc-ref %build-inputs "magit-popup")) (site-lisp "/share/emacs/site-lisp")) (list (string-append "--with-guix-site-dir=" - guix "/share/guile/site/2.0") + (car (find-files (string-append guix + "/share/guile/site") + (lambda (file stat) + (string-prefix? + "2." + (basename file))) + #:directories? #t))) (string-append "--with-geiser-lispdir=" geiser site-lisp) (string-append "--with-dash-lispdir=" dash site-lisp "/guix.d/dash-" |