[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/06: gnu: leptonica: Use new package style.
From: |
guix-commits |
Subject: |
04/06: gnu: leptonica: Use new package style. |
Date: |
Mon, 27 Feb 2023 17:54:36 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit fb9124cb049061b2a51589420dd528962972b04b
Author: Simon South <simon@simonsouth.net>
AuthorDate: Wed Feb 15 11:44:10 2023 -0500
gnu: leptonica: Use new package style.
* gnu/packages/image.scm (leptonica)[inputs]: Remove labels.
[arguments]<#:phases>: Use gexps; use "this-package-input" to locate package
input; do not explicitly return #t from phases.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/image.scm | 50 ++++++++++++++++++++++++--------------------------
1 file changed, 24 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 5071dd588f..8212407cc1 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -619,33 +619,31 @@ collection of tools for doing simple manipulations of
TIFF images.")
libtool
pkg-config))
(inputs
- `(("giflib" ,giflib)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("libtiff" ,libtiff)
- ("libwebp" ,libwebp)
- ("openjpeg" ,openjpeg)
- ("zlib" ,zlib)))
+ (list giflib
+ libjpeg-turbo
+ libpng
+ libtiff
+ libwebp
+ openjpeg
+ zlib))
(arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-reg-wrapper
- (lambda _
- (substitute* "prog/reg_wrapper.sh"
- ((" /bin/sh ")
- (string-append " " (which "sh") " "))
- (("which gnuplot")
- "true"))
- #t))
- (add-after 'install 'provide-absolute-giflib-reference
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (giflib (assoc-ref inputs "giflib")))
- ;; Add an absolute reference to giflib to avoid propagation.
- (with-directory-excursion (string-append out "/lib")
- (substitute* '("liblept.la" "pkgconfig/lept.pc")
- (("-lgif") (string-append "-L" giflib "/lib -lgif"))))
- #t))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-reg-wrapper
+ (lambda _
+ (substitute* "prog/reg_wrapper.sh"
+ ((" /bin/sh ")
+ (string-append " " (which "sh") " "))
+ (("which gnuplot")
+ "true"))))
+ (add-after 'install 'provide-absolute-giflib-reference
+ (lambda _
+ (let ((giflib #$(this-package-input "giflib")))
+ ;; Add an absolute reference to giflib to avoid propagation.
+ (with-directory-excursion (string-append #$output "/lib")
+ (substitute* '("liblept.la" "pkgconfig/lept.pc")
+ (("-lgif") (string-append "-L" giflib "/lib
-lgif"))))))))))
(home-page "http://www.leptonica.com/")
(synopsis "Library and tools for image processing and analysis")
(description
- branch master updated (a31225badb -> ff5fbcc19b), guix-commits, 2023/02/27
- 01/06: pack: Adjust shell tests to read-only tarball root., guix-commits, 2023/02/27
- 02/06: ui: 'display-hint' quotes extra arguments for Texinfo., guix-commits, 2023/02/27
- 03/06: gnu: hyfetch: Update to 1.4.7., guix-commits, 2023/02/27
- 04/06: gnu: leptonica: Use new package style.,
guix-commits <=
- 05/06: gnu: leptonica: Update to 1.83.1., guix-commits, 2023/02/27
- 06/06: gnu: Add barectf., guix-commits, 2023/02/27