From 01eafd38fbeb49d8167d99569eb624ab404bbeb2 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 9 Oct 2013 00:09:04 +0200
Subject: gnu: Use the 'patches' field of <origin>.

* gnu/packages/apr.scm,
  gnu/packages/autotools.scm,
  gnu/packages/avahi.scm,
  gnu/packages/cdrom.scm,
  gnu/packages/cmake.scm,
  gnu/packages/cpio.scm,
  gnu/packages/cross-base.scm,
  gnu/packages/emacs.scm,
  gnu/packages/flex.scm,
  gnu/packages/fontutils.scm,
  gnu/packages/glib.scm,
  gnu/packages/grub.scm,
  gnu/packages/guile.scm,
  gnu/packages/idutils.scm,
  gnu/packages/libevent.scm,
  gnu/packages/linux.scm,
  gnu/packages/mail.scm,
  gnu/packages/make-bootstrap.scm,
  gnu/packages/mp3.scm,
  gnu/packages/oggvorbis.scm,
  gnu/packages/pdf.scm,
  gnu/packages/plotutils.scm,
  gnu/packages/qemu.scm,
  gnu/packages/recutils.scm,
  gnu/packages/rush.scm,
  gnu/packages/scheme.scm,
  gnu/packages/system.scm,
  gnu/packages/tcsh.scm,
  gnu/packages/valgrind.scm,
  gnu/packages/vpn.scm,
  gnu/packages/w3m: Use the 'patches' field of <origin> instead of
  adding a patch as input plus using #:patches.
---
 gnu/packages/w3m.scm | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'gnu/packages/w3m.scm')

diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm
index 9199cbd488..b5122d4f23 100644
--- a/gnu/packages/w3m.scm
+++ b/gnu/packages/w3m.scm
@@ -35,14 +35,17 @@
   (package
     (name "w3m")
     (version "0.5.3")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://sourceforge/w3m/w3m-"
-                          version ".tar.gz"))
-      (sha256
-       (base32
-        "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579"))))
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://sourceforge/w3m/w3m-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579"))
+
+             ;; cf. https://bugs.archlinux.org/task/33397
+             (patches (list (search-patch "w3m-fix-compile.patch")))
+             (patch-flags '("-p0"))))
     (build-system gnu-build-system)
     (arguments `(#:tests? #f  ; no check target
                  #:phases (alist-cons-before
@@ -56,11 +59,7 @@
                              (substitute* '("scripts/w3mmail.cgi.in"
                                             "scripts/dirlist.cgi.in")
                                (("@PERL@") (which "perl"))))
-                           %standard-phases)
-                 ;; cf. https://bugs.archlinux.org/task/33397
-                 #:patches (list (assoc-ref %build-inputs
-                                            "patch/fix-compile"))
-                 #:patch-flags '("-p0")))
+                           %standard-phases)))
     (inputs
      `(("gettext" ,guix:gettext)
        ("libgc" ,libgc)
@@ -68,8 +67,7 @@
        ("openssl" ,openssl)
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)
-       ("zlib" ,zlib)
-       ("patch/fix-compile" ,(search-patch "w3m-fix-compile.patch"))))
+       ("zlib" ,zlib)))
     (home-page "http://w3m.sourceforge.net/")
     (synopsis "w3m, a text-mode web browser")
     (description
-- 
cgit v1.2.3