build: emacs: Fix bug and improvement robustness.

* guix/build/emacs-build-system.scm (emacs-inputs): Fix matching pattern.
  (patch-el-files): Improve regexp pattern.
This commit is contained in:
Federico Beffa 2015-07-23 10:06:38 +02:00
parent 85777fe57a
commit 40aee1a133

View file

@ -59,7 +59,7 @@ (define* (patch-el-files #:key outputs #:allow-other-keys)
(el-dir (string-append out %install-suffix "/" elpa-name-ver))
(substitute-cmd (lambda ()
(substitute* (find-files "." "\\.el$")
(("\"/bin/(.*)\"" _ cmd)
(("\"/bin/([^.].*)\"" _ cmd)
(string-append "\"" (which cmd) "\""))))))
(with-directory-excursion el-dir
;; Some old '.el' files (e.g., tex-buf.el in AUCTeX) are still encoded
@ -114,7 +114,7 @@ (define (emacs-package? name)
(define (emacs-inputs inputs)
"Retrieve the list of Emacs packages from INPUTS."
(filter (match-lambda
((label directory)
((label . directory)
(emacs-package? ((compose package-name->name+version
store-directory->name-version)
directory)))