diff options
author | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
---|---|---|
committer | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
commit | 8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb (patch) | |
tree | 7177d90f3a8f0ba34630e78b5516dbda68ff0570 /guix/build/emacs-build-system.scm | |
parent | 404e3d8b1bcd92ad934711fe759feb220f4d1c60 (diff) | |
parent | 484a72a036e6a8af43f517d6547446f3de344a07 (diff) | |
download | guix-patches-8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb.tar guix-patches-8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb.tar.gz |
Merge 'master' into core-updates
Diffstat (limited to 'guix/build/emacs-build-system.scm')
-rw-r--r-- | guix/build/emacs-build-system.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index 2404dbddb4..bd0d2e0266 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -92,8 +92,12 @@ store in '.el' files." (el-dir (string-append out %install-suffix "/" elpa-name-ver)) (substitute-cmd (lambda () (substitute* (find-files "." "\\.el$") - (("\"/bin/([^.].*)\"" _ cmd) - (string-append "\"" (which cmd) "\"")))))) + (("\"/bin/([^.]\\S*)\"" _ cmd-name) + (let ((cmd (which cmd-name))) + (unless cmd + (error + "patch-el-files: unable to locate " cmd-name)) + (string-append "\"" cmd "\""))))))) (with-directory-excursion el-dir ;; Some old '.el' files (e.g., tex-buf.el in AUCTeX) are still encoded ;; with the "ISO-8859-1" locale. |