[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/16: gnu: freetalk: Modernise arguments' style.
From: |
guix-commits |
Subject: |
02/16: gnu: freetalk: Modernise arguments' style. |
Date: |
Wed, 27 Jul 2022 06:30:01 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit f8b7320ab22a9df2450b338d5755ae4ae1e281c6
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jul 24 02:00:00 2022 +0200
gnu: freetalk: Modernise arguments' style.
* gnu/packages/messaging.scm (freetalk)[arguments]: Use a G-expression.
Use SEARCH-INPUT-FILE to find representative binaries instead of relying
on package names, and 'suffix rather than 'prefix their location to PATH.
---
gnu/packages/messaging.scm | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 1581434ae8..eee082ed8e 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2091,20 +2091,22 @@ support, and more.")
"105mw7pg2mcp85r82cs4rv77nwvbw8025047364jzbq6lwllynxv"))))
(build-system gnu-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- ;; For 'system' commands in Scheme code.
- (add-after 'install 'wrap-program
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bash (assoc-ref inputs "bash"))
- (coreutils (assoc-ref inputs "coreutils"))
- (less (assoc-ref inputs "less")))
- (wrap-program (string-append out "/bin/freetalk")
- `("PATH" ":" prefix
- ,(map (lambda (dir)
- (string-append dir "/bin"))
- (list bash coreutils less))))))))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'wrap-program
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/freetalk")
+ `("PATH" ":" suffix
+ ,(map (lambda (command)
+ (dirname
+ (search-input-file
+ inputs (string-append "bin/" command))))
+ ;; This list is not exhaustive: we assume that,
+ ;; e.g., cat is packaged with other coreutils.
+ (list "bash" ; src/{commands,util}.c et al
+ "cat" ; extensions/first-time-run.sh
+ "less")))))))))) ; extensions/history.scm.
(native-inputs
(list autoconf automake pkg-config texinfo))
(inputs
- branch master updated (56e17f6493 -> 75bc96ed8e), guix-commits, 2022/07/27
- 05/16: gnu: imgui: Update to 1.88., guix-commits, 2022/07/27
- 04/16: gnu: es: Use URL-FETCH/TARBOMB., guix-commits, 2022/07/27
- 12/16: gnu: libconfini: Update to 1.16.4., guix-commits, 2022/07/27
- 06/16: gnu: qtractor: Update to 0.9.27., guix-commits, 2022/07/27
- 10/16: gnu: nbd: Update to 3.24., guix-commits, 2022/07/27
- 07/16: gnu: qtractor: Remove input labels., guix-commits, 2022/07/27
- 11/16: gnu: ndisc6: Update to 1.0.6., guix-commits, 2022/07/27
- 02/16: gnu: freetalk: Modernise arguments' style.,
guix-commits <=
- 13/16: gnu: libconfini: Omit static library., guix-commits, 2022/07/27
- 15/16: gnu: osinfo-db: Update to 20220516., guix-commits, 2022/07/27
- 14/16: gnu: get-iplayer: Update to 3.30., guix-commits, 2022/07/27
- 08/16: gnu: podofo: Update to 0.9.8., guix-commits, 2022/07/27
- 09/16: gnu: podofo: Remove input labels., guix-commits, 2022/07/27
- 01/16: gnu: freetalk: Update to 4.2., guix-commits, 2022/07/27
- 16/16: download: Refresh KDE mirror list., guix-commits, 2022/07/27
- 03/16: gnu: es: Update to 0.9.2., guix-commits, 2022/07/27