From 40aee1a133fd5163db543a224c1814eddb63087b Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Thu, 23 Jul 2015 10:06:38 +0200 Subject: [PATCH] build: emacs: Fix bug and improvement robustness. * guix/build/emacs-build-system.scm (emacs-inputs): Fix matching pattern. (patch-el-files): Improve regexp pattern. --- guix/build/emacs-build-system.scm | 4 ++-- 1 file 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 @@ (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)))