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.
This commit is contained in:
		
							parent
							
								
									5ae59eb6d9
								
							
						
					
					
						commit
						d0a26f3a68
					
				
					 1 changed files with 6 additions and 4 deletions
				
			
		| 
						 | 
					@ -47,10 +47,12 @@
 | 
				
			||||||
(define (store-file->elisp-source-file file)
 | 
					(define (store-file->elisp-source-file file)
 | 
				
			||||||
  "Convert FILE, a store file name for an Emacs Lisp source file, into a 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."
 | 
					name that has been stripped of the hash and version number."
 | 
				
			||||||
 | 
					  (let ((suffix ".el"))
 | 
				
			||||||
    (let-values (((name version)
 | 
					    (let-values (((name version)
 | 
				
			||||||
                  (package-name->name+version
 | 
					                  (package-name->name+version
 | 
				
			||||||
                 (strip-store-file-name file))))
 | 
					                   (basename
 | 
				
			||||||
    (string-append name ".el")))
 | 
					                    (strip-store-file-name file) suffix))))
 | 
				
			||||||
 | 
					      (string-append name suffix))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define* (unpack #:key source #:allow-other-keys)
 | 
					(define* (unpack #:key source #:allow-other-keys)
 | 
				
			||||||
  "Unpack SOURCE into the build directory.  SOURCE may be a compressed
 | 
					  "Unpack SOURCE into the build directory.  SOURCE may be a compressed
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue