aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2015-12-02 22:47:48 +0300
committerAlex Kost <alezost@gmail.com>2015-12-10 13:23:50 +0300
commit932ece6553b6a8e9062ed16c7b2b11848c8f544e (patch)
tree14c3218a010b7bb4c0be4849aa5eecae39be92b4
parentdcb7119a6dcc1c0830040f19d929972ee0440b91 (diff)
downloadpatches-932ece6553b6a8e9062ed16c7b2b11848c8f544e.tar
patches-932ece6553b6a8e9062ed16c7b2b11848c8f544e.tar.gz
gnu: emacs-w3m: Use 'modify-syntax'.
* gnu/packages/emacs.scm (emacs-w3m)[arguments]: Use 'modify-syntax'.
-rw-r--r--gnu/packages/emacs.scm67
1 files changed, 33 insertions, 34 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 947ddcb798..e0c986ee46 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