diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-08 09:02:05 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-08 14:10:33 -0500 |
| commit | 0715793373059951e79bf94c92a4c75f547752d6 (patch) | |
| tree | 58291d581c631844cf42af235530b39fa5ac0613 | |
| parent | 485ac28235bf8775914b905060266b09629c1bac (diff) | |
| download | guix-0715793373059951e79bf94c92a4c75f547752d6.tar.gz | |
build-systems/emacs: No longer skip patching of files containing NULs.
This follows the fix to <https://bugs.gnu.org/30116>. * guix/build/emacs-build-system.scm (patch-el-files) [file-contains-nul-char]: Remove nested procedure. [el-file]: Do no filter out files containing NUL characters.
| -rw-r--r-- | guix/build/emacs-build-system.scm | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index 26ea59bc25..79a1a42c4a 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -105,23 +105,9 @@ environment variable\n" source-directory))) "Substitute the absolute \"/bin/\" directory with the right location in the store in '.el' files." - (define (file-contains-nul-char? file) - (call-with-input-file file - (lambda (in) - (let loop ((line (read-line in 'concat))) - (cond - ((eof-object? line) #f) - ((string-index line #\nul) #t) - (else (loop (read-line in 'concat)))))) - #:binary #t)) - (let* ((out (assoc-ref outputs "out")) (site-lisp (string-append out %install-dir)) - ;; (ice-9 regex) uses libc's regexp routines, which cannot deal with - ;; strings containing NULs. Filter out such files. TODO: Remove - ;; this workaround when <https://bugs.gnu.org/30116> is fixed. - (el-files (remove file-contains-nul-char? - (find-files (getcwd) "\\.el$")))) + (el-files (find-files (getcwd) "\\.el$"))) (define (substitute-program-names) (substitute* el-files (("\"/bin/([^.]\\S*)\"" _ cmd-name) |