summaryrefslogtreecommitdiff
path: root/guix/build
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-09-23 17:34:54 -0400
committerMark H Weaver <mhw@netris.org>2015-09-23 17:38:47 -0400
commita05c06720a32220ab4b688fd2496746099a6da39 (patch)
tree11e6ec814f3ad35f6313b755a7360feccceb6006 /guix/build
parentbd90127ad43d08c39e5bd592d03f7c0a4c683afe (diff)
emacs-build-system: Fix 'package-name-version->elpa-name-version'.
Fixes a regression introduced in b7c7c03eb5e37fc3455e4e17b0898ffc4bca29c3. * guix/build/emacs-build-system.scm (package-name-version->elpa-name-version): Remove unused 'name' binding. Do not abuse 'strip-store-file-name' to remove the "emacs-" prefix, which worked before b7c7c03eb5 but not after.
Diffstat (limited to 'guix/build')
-rw-r--r--guix/build/emacs-build-system.scm7
1 files changed, 3 insertions, 4 deletions
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
index cb5bde3191..f0a9a6e125 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -138,10 +138,9 @@ DIRS."
(define (package-name-version->elpa-name-version name-ver)
"Convert the Guix package NAME-VER to the corresponding ELPA name-version
format. Essnetially drop the prefix used in Guix."
- (let ((name (strip-store-file-name name-ver)))
- (if (emacs-package? name-ver)
- (strip-store-file-name name-ver)
- name-ver)))
+ (if (emacs-package? name-ver) ; checks for "emacs-" prefix
+ (string-drop name-ver (string-length "emacs-"))
+ name-ver))
(define (store-directory->elpa-name-version store-dir)
"Given a store directory STORE-DIR return the part of the basename after the