diff options
| author | Morgan Smith <Morgan.J.Smith@outlook.com> | 2020-09-14 18:08:19 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-01 11:03:56 -0400 |
| commit | f88fea0eaa5796303790450ee4543a6d7e61a06e (patch) | |
| tree | bf18e448ddf00f02bb9b07e2d302982278f75479 /gnu/packages | |
| parent | 18e76f89055f25f015fadb7c999b410f38a88cc6 (diff) | |
| download | guix-f88fea0eaa5796303790450ee4543a6d7e61a06e.tar.gz | |
gnu: emacs-next: Fix load path and version.
Fixes <http://issues.guix.info/43277>. * gnu/packages/emacs.scm (emacs)[strip-double-wrap]: Modify to work with emacs-next. (emacs-next)[version]: Use git-version to produce the version string. [arguments]: Remove field. [native-search-paths]: Add field. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/emacs.scm | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 03c28ee7a7..4963379d74 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -196,11 +196,16 @@ (lambda* (#:key outputs #:allow-other-keys) ;; Directly copy emacs-X.Y to emacs, so that it is not wrapped ;; twice. This also fixes a minor issue, where WMs would not be - ;; able to track emacs back to emacs.desktop. + ;; able to track emacs back to emacs.desktop. The version is + ;; accessed using using THIS-PACKAGE so it "just works" for + ;; inherited Emacs packages of different versions. (with-directory-excursion (assoc-ref outputs "out") (copy-file (string-append "bin/emacs-" - ,(version-major+minor (package-version emacs))) + ,(let ((this-version (package-version this-package))) + (or (false-if-exception + (version-major+minor+point this-version)) + (version-major+minor this-version)))) "bin/emacs") #t))) (add-before 'reset-gzip-timestamps 'make-compressed-files-writable @@ -279,11 +284,10 @@ languages.") (define-public emacs-next (let ((commit "2ea34662c20f71d35dd52a5ed996542c7386b9cb") - (revision "0") - (emacs-version "28.0.50.1")) + (revision "0")) (package/inherit emacs (name "emacs-next") - (version (git-version emacs-version revision commit)) + (version (git-version "28.0.50" revision commit)) (source (origin (inherit (package-source emacs)) @@ -295,24 +299,20 @@ languages.") (sha256 (base32 "0igjm9kwiswn2dpiy2k9xikbdfc7njs07ry48fqz70anljj8y7y3")))) - (arguments - (substitute-keyword-arguments (package-arguments emacs) - ((#:phases phases) - `(modify-phases ,phases - (replace 'strip-double-wrap - (lambda* (#:key outputs #:allow-other-keys) - ;; Directly copy emacs-X.Y to emacs, so that it is not wrapped - ;; twice. This also fixes a minor issue, where WMs would not be - ;; able to track emacs back to emacs.desktop. - (with-directory-excursion (assoc-ref outputs "out") - (copy-file (string-append - "bin/emacs-" - ,(version-major+minor+point (package-version emacs-next))) - "bin/emacs") - #t))))))) (native-inputs `(("autoconf" ,autoconf) - ,@(package-native-inputs emacs)))))) + ,@(package-native-inputs emacs))) + (native-search-paths + (list (search-path-specification + (variable "EMACSLOADPATH") + ;; The versioned entry is for the Emacs' builtin libraries. + (files (list "share/emacs/site-lisp" + (string-append "share/emacs/" + (version-major+minor+point version) + "/lisp")))) + (search-path-specification + (variable "INFOPATH") + (files '("share/info")))))))) (define-public emacs-minimal ;; This is the version that you should use as an input to packages that just |