[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/55: gnu: uwufetch: Avoid top-level package references.
From: |
guix-commits |
Subject: |
15/55: gnu: uwufetch: Avoid top-level package references. |
Date: |
Thu, 21 Sep 2023 13:31:35 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 2b1eb3c1cf45cf916e30c3b32b3526d90a636cd9
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Sep 15 11:18:25 2023 +0800
gnu: uwufetch: Avoid top-level package references.
* gnu/packages/admin.scm (uwufetch)[arguments]: Use the grep and gawk
provided
by INPUTS, instead of the top-level variables.
---
gnu/packages/admin.scm | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index f9fffcec2b..4ddd03fecf 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4074,15 +4074,15 @@ you are running, what theme or icon set you are using,
etc.")
#~(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'patch-source-paths
- (lambda _
- (substitute* "fetch.c"
- (("grep")
- #$(file-append grep "/bin/grep"))
- (("awk")
- #$(file-append gawk "/bin/awk")))
- (substitute* "uwufetch.c"
- (("(/usr(/local)?)(.*;)" all _ _ rest)
- (string-append #$output rest)))))
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((grep (search-input-file inputs "/bin/grep"))
+ (awk (search-input-file inputs "/bin/awk")))
+ (substitute* "fetch.c"
+ (("grep") grep)
+ (("awk") awk))
+ (substitute* "uwufetch.c"
+ (("(/usr(/local)?)(.*;)" all _ _ rest)
+ (string-append #$output rest))))))
;; TODO this will be fixed in the next release of uwufetch
(add-before 'install 'make-include-dir
(lambda _
- branch master updated (ee7c9d2541 -> fdfafaa48c), guix-commits, 2023/09/21
- 03/55: gnu: python-certauth: Fix test failure with newer PyOpenSSL., guix-commits, 2023/09/21
- 01/55: gnu: Add python-jwcrypto., guix-commits, 2023/09/21
- 04/55: gnu: python-filelock: Update home page., guix-commits, 2023/09/21
- 05/55: gnu: python-deprecated: Remove unused inputs., guix-commits, 2023/09/21
- 06/55: gnu: Add python-a2wsgi., guix-commits, 2023/09/21
- 18/55: gnu: python-dj-database-url: Update to 2.1.0., guix-commits, 2023/09/21
- 08/55: gnu: Add python-tracerite., guix-commits, 2023/09/21
- 15/55: gnu: uwufetch: Avoid top-level package references.,
guix-commits <=
- 17/55: gnu: Add python-dj-email-url., guix-commits, 2023/09/21
- 21/55: gnu: Add python-django-configurations., guix-commits, 2023/09/21
- 23/55: gnu: python-django-picklefield: Update to 3.1.0., guix-commits, 2023/09/21
- 27/55: gnu: graphite-web: Update to 1.1.10., guix-commits, 2023/09/21
- 28/55: gnu: Remove python-django@2.2., guix-commits, 2023/09/21
- 29/55: gnu: python-flex: Update to 6.14.1., guix-commits, 2023/09/21
- 34/55: gnu: python-django@3.2: Update to 3.2.21., guix-commits, 2023/09/21
- 35/55: gnu: python-asgiref: Update to 3.7.2., guix-commits, 2023/09/21
- 40/55: gnu: python-distlib: Don't reference the implicit bash input., guix-commits, 2023/09/21
- 52/55: gnu: python-libnacl: Update to 2.1.0., guix-commits, 2023/09/21