nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guix/build/emacs-build-system.scm
View File

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