branch master updated: gnu: ytfzf: Use patches inside source block, instead of inputs.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

raghavgururajan pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new ffc04f5  gnu: ytfzf: Use patches inside source block, instead of 
inputs.
ffc04f5 is described below

commit ffc04f5cc6df16b5c10746ce7e4ef44fafc626e6
Author: Raghav Gururajan <rg@raghavgururajan.name>
AuthorDate: Tue Jul 6 09:08:29 2021 -0400

    gnu: ytfzf: Use patches inside source block, instead of inputs.
    
    * gnu/packages/image-viewers.scm (ytfzf)[patches]: Add ytfzf-programs.patch
    and ytfzf-updates.patch.
    [phases](apply-patches): Remove phase.
    [native-inputs]: Remove ytfzf-programs and ytfzf-updates.
---
 gnu/packages/image-viewers.scm | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index bb2eb6a..895a331 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -100,7 +100,13 @@
          (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "00d416qb4109pm77ikhnmds8qng90ni2jan9kdnxz7b6sh5f61nz"))))
+        (base32 "00d416qb4109pm77ikhnmds8qng90ni2jan9kdnxz7b6sh5f61nz"))
+       (patches
+        (search-patches
+         ;; Pre-requisite for 'patch-script' phase.
+         "ytfzf-programs.patch"
+         ;; Disables self-update.
+         "ytfzf-updates.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ;no test suite
@@ -110,15 +116,7 @@
         (srfi srfi-26))
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'apply-patches
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; Pre-requisite for 'patch-script' phase.
-             (invoke "patch" "--input"
-                     (assoc-ref inputs "ytfzf-programs"))
-             ;; Disables self-update.
-             (invoke "patch" "--input"
-                     (assoc-ref inputs "ytfzf-updates"))))
-         (add-after 'apply-patches 'patch-script
+         (add-after 'unpack 'patch-script
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (bash (assoc-ref inputs "bash"))
@@ -224,11 +222,6 @@
                (("report at: https://github.com/pystardust/ytfzf";)
                 "report at: https://issues.guix.gnu.org";))))
          (delete 'configure))))         ;no configure script
-    (native-inputs
-     `(("ytfzf-programs"
-        ,(search-patch "ytfzf-programs.patch"))
-       ("ytfzf-updates"
-        ,(search-patch "ytfzf-updates.patch"))))
     (inputs
      `(("bash" ,bash)
        ("catimg" ,catimg)