diff options
| author | Raghav Gururajan <rg@raghavgururajan.name> | 2021-07-06 09:08:29 -0400 |
|---|---|---|
| committer | Raghav Gururajan <rg@raghavgururajan.name> | 2021-07-06 09:08:29 -0400 |
| commit | ffc04f5cc6df16b5c10746ce7e4ef44fafc626e6 (patch) | |
| tree | 86673b0566c11271cf2d2194398f786b30cbe96e | |
| parent | aa6e6fb2e9ea231d12d49a8925fddd8d2686ea94 (diff) | |
| download | guix-ffc04f5cc6df16b5c10746ce7e4ef44fafc626e6.tar.gz guix-ffc04f5cc6df16b5c10746ce7e4ef44fafc626e6.zip | |
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.
| -rw-r--r-- | gnu/packages/image-viewers.scm | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index bb2eb6a30e..895a331aee 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) |