06/12: build: emacs: Fix bug and improvement robustness.

[Federico Beffa]

beffa pushed a commit to branch master
in repository guix.

commit 40aee1a133fd5163db543a224c1814eddb63087b
Author: Federico Beffa <address@hidden>
Date:   Thu Jul 23 10:06:38 2015 +0200

    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 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/build/emacs-build-system.scm 
b/guix/build/emacs-build-system.scm
index dd3cfc4..f18db0a 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)))