summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Beffa <beffa@fbengineering.ch>2015-07-23 10:06:38 +0200
committerFederico Beffa <beffa@fbengineering.ch>2015-08-01 12:37:13 +0200
commit40aee1a133fd5163db543a224c1814eddb63087b (patch)
treee5d373d555023bc59b41b0c62eb0e1615aa4a2a5
parent85777fe57a081ad0258badcfc264cb850ad0e7aa (diff)
build: emacs: Fix bug and improvement robustness.
* guix/build/emacs-build-system.scm (emacs-inputs): Fix matching pattern. (patch-el-files): Improve regexp pattern.
-rw-r--r--guix/build/emacs-build-system.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
index dd3cfc47ac..f18db0aadd 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -59,7 +59,7 @@ store in '.el' files."
(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 @@ store in '.el' files."
(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)))