guix-commits
[Top][All Lists]
Advanced

[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 _



reply via email to

[Prev in Thread] Current Thread [Next in Thread]