diff options
| author | Arun Isaac <arunisaac@systemreboot.net> | 2017-05-17 21:39:27 +0530 |
|---|---|---|
| committer | Arun Isaac <arunisaac@systemreboot.net> | 2017-05-23 04:35:06 +0530 |
| commit | d0a26f3a68c77d6071967a9711c53988570b91e5 (patch) | |
| tree | a420a7dc4a2ba85ef9ed181e081800d19f9196cc | |
| parent | 5ae59eb6d99b7ac6e3334418781b0559bf604a23 (diff) | |
| download | guix-d0a26f3a68c77d6071967a9711c53988570b91e5.tar.gz guix-d0a26f3a68c77d6071967a9711c53988570b91e5.zip | |
build: emacs: Fix `store-file->elisp-source-file'.
This prevents a ".el.el" extension for source files with no version number in
their file name.
* guix/build/emacs-build-system.scm (store-file->elisp-source-file): Remove
".el" extension from file name before splitting to name and version.
| -rw-r--r-- | guix/build/emacs-build-system.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index 44e8b0d31e..3538e9ff47 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -47,10 +47,12 @@ (define (store-file->elisp-source-file file) "Convert FILE, a store file name for an Emacs Lisp source file, into a file name that has been stripped of the hash and version number." - (let-values (((name version) - (package-name->name+version - (strip-store-file-name file)))) - (string-append name ".el"))) + (let ((suffix ".el")) + (let-values (((name version) + (package-name->name+version + (basename + (strip-store-file-name file) suffix)))) + (string-append name suffix)))) (define* (unpack #:key source #:allow-other-keys) "Unpack SOURCE into the build directory. SOURCE may be a compressed |