diff options
| author | Leo Prikler <leo.prikler@student.tugraz.at> | 2021-04-17 19:06:45 +0200 |
|---|---|---|
| committer | Leo Prikler <leo.prikler@student.tugraz.at> | 2021-05-01 15:56:42 +0200 |
| commit | 0912a64ec03353816872b6149af1484cb1f52372 (patch) | |
| tree | 25f2dc81cf76f124df7e2392b4236f2bfea155c9 | |
| parent | 89c0505e90626905b5e7c359740aa0fec4b32626 (diff) | |
| download | guix-0912a64ec03353816872b6149af1484cb1f52372.tar guix-0912a64ec03353816872b6149af1484cb1f52372.tar.gz | |
gnu: emacs-w3m: Adjust to changes in emacs-build-system.
* gnu/packages/emacs-xyz.scm (emacs-w3m)[#:configure-flags]: Use
elpa-directory to determine lispdir.
[#:phases]<install>: Likewise.
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6c75d139e2..2ce06c3e0e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1752,14 +1752,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 @@ -1804,8 +1806,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)))))) |