[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#47661] [PATCH 30/33] gnu: emacs-w3m: Adjust to changes in emacs-bui
From: |
Leo Prikler |
Subject: |
[bug#47661] [PATCH 30/33] gnu: emacs-w3m: Adjust to changes in emacs-build-system. |
Date: |
Thu, 8 Apr 2021 19:50:04 +0200 |
* gnu/packages/emacs-xyz.scm (emacs-w3m)[#:configure-flags]: Use
elpa-directory to determine lispdir.
[#:phases]<install>: Likewise.
---
gnu/packages/emacs-xyz.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 31312e9001..a7a1925c8e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1696,14 +1696,16 @@ or unexpected behavior inside an elisp configuration
file (typically
("imagemagick" ,imagemagick)))
(arguments
`(#:modules ((guix build gnu-build-system)
+ ((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)
(guix build emacs-utils))
#:imported-modules (,@%gnu-build-system-modules
+ (guix build emacs-build-system)
(guix build emacs-utils))
#:configure-flags
(let ((out (assoc-ref %outputs "out")))
(list (string-append "--with-lispdir="
- out "/share/emacs/site-lisp")
+ (emacs:elpa-directory out))
(string-append "--with-icondir="
out "/share/images/emacs-w3m")
;; Leave .el files uncompressed, otherwise GC can't
@@ -1748,8 +1750,7 @@ or unexpected behavior inside an elisp configuration file
(typically
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "install" "install-icons")
(with-directory-excursion
- (string-append (assoc-ref outputs "out")
- "/share/emacs/site-lisp")
+ (emacs:elpa-directory (assoc-ref outputs "out"))
(for-each delete-file '("ChangeLog" "ChangeLog.1"))
(symlink "w3m-load.el" "w3m-autoloads.el")
#t))))))
--
2.31.1
- [bug#47661] [PATCH 15/33] gnu: emacs-sly-stepper: Remove generated sources., (continued)
- [bug#47661] [PATCH 15/33] gnu: emacs-sly-stepper: Remove generated sources., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 17/33] gnu: emacs-edbi: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 18/33] gnu: emacs-scel: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 19/33] gnu: emacs-vterm: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 20/33] gnu: notmuch: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 23/33] gnu: emacs-geiser: Update to 0.13., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 24/33] gnu: Add emacs-geiser-guile., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 25/33] gnu: emacs-guix: Update to 0.5.2-4.8ce6d21., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 21/33] gnu: emacs-pyim: Update to 3.6., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 32/33] gnu: emacs-haskell-mode: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 30/33] gnu: emacs-w3m: Adjust to changes in emacs-build-system.,
Leo Prikler <=
- [bug#47661] [PATCH 29/33] gnu: emacs-dvc: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 33/33] gnu: emacs-julia-snail: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 22/33] gnu: emacs-realgud: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 27/33] gnu: guile-studio: Add missing input., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 26/33] gnu: emacs-flycheck-guile: Add missing input., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 31/33] gnu: emacs-wget: Port to emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 28/33] gnu: geiser-gauche: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH v2 01/33] profiles: Add hook for Emacs subdirs., Leo Prikler, 2021/04/17