GNU bug report logs - #65189
[PATCH] gnu: uwufetch: Add and use missing inputs.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Juliana Sims <juli <at> incana.org>
Subject: bug#65189: closed (oops, emailed this wrong)
Date: Thu, 10 Aug 2023 02:35:02 +0000

[Message part 1 (text/plain, inline)]

Your bug report

#65189: [PATCH] gnu: uwufetch: Add and use missing inputs.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 65189 <at> debbugs.gnu.org.

-- 
65189: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65189
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Juliana Sims <juli <at> incana.org>
To: 65189-done <at> debbugs.gnu.org
Subject: oops, emailed this wrong
Date: Wed, 09 Aug 2023 22:34:39 -0400

i done did a bad and sent the email wrong :(

[Message part 3 (message/rfc822, inline)]

From: Juliana Sims <juli <at> incana.org>
To: guix-patches <at> gnu.org
Cc: ludo <at> gnu.org, Juliana Sims <juli <at> incana.org>
Subject: [PATCH] gnu: uwufetch: Add and use missing inputs.
Date: Wed,  9 Aug 2023 21:20:23 -0400

Hi Ludovic,

Putting the fully-qualified paths of binaries into the source like this had not
occurred to me before, but it seems so obviously correct now. Thanks for
suggesting it! This patch uses that technique; I'll be adding it to my bag of
packaging tricks for the future as well :)

Thanks,
Juli

* gnu/packages/admin.scm (uwufetch) [inputs]: Add missing inputs.
[phases]: Use the fully-qualified paths of the input gawk and grep.
---
 gnu/packages/admin.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 33f9b703a7..6b6b05c4a0 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4025,6 +4025,11 @@ (define-public uwufetch
           (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)))))
@@ -4033,6 +4038,8 @@ (define-public uwufetch
             (lambda _
               (mkdir-p (string-append #$output "/include")))))))
     (inputs (list lshw
+                  gawk
+                  grep
                   ;; viu XXX not yet packaged in Guix
                   xwininfo))
     (home-page "https://github.com/TheDarkBug/uwufetch")

base-commit: 90e34d25d5e7c14b7f3293a78f3cdad676c0d035
-- 
2.41.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.