From ed9fb46b16cf7632e6df15c52c7183807fe5d1f9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 22 Apr 2017 23:15:47 +0200 Subject: 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. --- gnu/packages/emacs.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') 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-" -- cgit v1.2.3