From: Alex Kost <alezost@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 2/3] gnu: emacs-w3m: Use 'modify-syntax'.
Date: Sun, 6 Dec 2015 13:39:19 +0300 [thread overview]
Message-ID: <1449398360-9794-3-git-send-email-alezost@gmail.com> (raw)
In-Reply-To: <1449398360-9794-1-git-send-email-alezost@gmail.com>
* gnu/packages/emacs.scm (emacs-w3m)[arguments]: Use 'modify-syntax'.
---
gnu/packages/emacs.scm | 67 +++++++++++++++++++++++++-------------------------
1 file changed, 33 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 947ddcb..e0c986e 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -600,40 +600,39 @@ provides an optional IDE-like error list.")
out "/share/images/emacs-w3m")))
#:tests? #f ; no check target
#:phases
- (alist-cons-after
- 'unpack 'autoconf
- (lambda _
- (zero? (system* "autoconf")))
- (alist-cons-before
- 'build 'patch-exec-paths
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (w3m (assoc-ref inputs "w3m"))
- (imagemagick (assoc-ref inputs "imagemagick"))
- (coreutils (assoc-ref inputs "coreutils")))
- (emacs-substitute-variables "w3m.el"
- ("w3m-command" (string-append w3m "/bin/w3m"))
- ("w3m-touch-command" (string-append coreutils "/bin/touch"))
- ("w3m-image-viewer" (string-append imagemagick "/bin/display"))
- ("w3m-icon-directory" (string-append out
- "/share/images/emacs-w3m")))
- (emacs-substitute-variables "w3m-image.el"
- ("w3m-imagick-convert-program" (string-append imagemagick
- "/bin/convert"))
- ("w3m-imagick-identify-program" (string-append imagemagick
- "/bin/identify")))
- #t))
- (alist-replace
- 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (and (zero? (system* "make" "install" "install-icons"))
- (with-directory-excursion
- (string-append (assoc-ref outputs "out")
- "/share/emacs/site-lisp")
- (for-each delete-file '("ChangeLog" "ChangeLog.1"))
- (symlink "w3m-load.el" "w3m-autoloads.el")
- #t)))
- %standard-phases)))))
+ (modify-phases %standard-phases
+ (add-after 'unpack 'autoconf
+ (lambda _
+ (zero? (system* "autoconf"))))
+ (add-before 'build 'patch-exec-paths
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (w3m (assoc-ref inputs "w3m"))
+ (imagemagick (assoc-ref inputs "imagemagick"))
+ (coreutils (assoc-ref inputs "coreutils")))
+ (emacs-substitute-variables "w3m.el"
+ ("w3m-command" (string-append w3m "/bin/w3m"))
+ ("w3m-touch-command"
+ (string-append coreutils "/bin/touch"))
+ ("w3m-image-viewer"
+ (string-append imagemagick "/bin/display"))
+ ("w3m-icon-directory"
+ (string-append out "/share/images/emacs-w3m")))
+ (emacs-substitute-variables "w3m-image.el"
+ ("w3m-imagick-convert-program"
+ (string-append imagemagick "/bin/convert"))
+ ("w3m-imagick-identify-program"
+ (string-append imagemagick "/bin/identify")))
+ #t)))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (and (zero? (system* "make" "install" "install-icons"))
+ (with-directory-excursion
+ (string-append (assoc-ref outputs "out")
+ "/share/emacs/site-lisp")
+ (for-each delete-file '("ChangeLog" "ChangeLog.1"))
+ (symlink "w3m-load.el" "w3m-autoloads.el")
+ #t)))))))
(home-page "http://emacs-w3m.namazu.org/")
(synopsis "Simple Web browser for Emacs based on w3m")
(description
--
2.6.3
next prev parent reply other threads:[~2015-12-06 10:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-06 10:39 [PATCH 0/3] Update 'emacs-w3m' and improve loading emacs autoloads Alex Kost
2015-12-06 10:39 ` [PATCH 1/3] emacs: Handle compiled and compressed autoloads Alex Kost
2015-12-07 23:00 ` Ludovic Courtès
2015-12-09 8:53 ` Alex Kost
2015-12-09 13:58 ` Ludovic Courtès
2015-12-10 10:26 ` Alex Kost
2015-12-11 9:51 ` Ludovic Courtès
2015-12-11 11:42 ` Alex Kost
2015-12-06 10:39 ` Alex Kost [this message]
2015-12-07 23:00 ` [PATCH 2/3] gnu: emacs-w3m: Use 'modify-syntax' Ludovic Courtès
2015-12-06 10:39 ` [PATCH 3/3] gnu: emacs-w3m: Update to 1.4.538+0.20141022 Alex Kost
2015-12-07 23:00 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449398360-9794-3-git-send-email-alezost@gmail.com \
--to=alezost@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.