unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Juliana Sims <juli@incana.org>
To: 64305@debbugs.gnu.org
Cc: ludo@gnu.org, Juliana Sims <juli@incana.org>
Subject: [bug#64305] [PATCH] gnu: uwufetch: Add and use missing inputs.
Date: Wed,  9 Aug 2023 22:37:16 -0400	[thread overview]
Message-ID: <1b44a2db770f4f2a956c2235ea9cba3f0d1383a9.1691635036.git.juli@incana.org> (raw)
In-Reply-To: <87h6p9r21j.fsf_-_@gnu.org>

Hi there,

Oops! I sent that last email wrong!

For Ludovic: this is the same as that other email, but I want to make sure
everything is threaded and catalogued properly.

For everyone else: this patch takes Ludovic's advice and substitutes references
to "grep" and "awk" in the uwufetch source code with references to the
fully-qualified paths of those binaries. It adds them as regular inputs rather
than the propagated inputs the previous version of this patch added them as.

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





  parent reply	other threads:[~2023-08-10  2:40 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-26 17:10 [bug#64305] [PATCH 0/4] Fixup uwufetch Juliana Sims
2023-06-26 17:14 ` [bug#64305] [PATCH 1/4] gnu: uwufetch: Fix typo in build phase name Juliana Sims
2023-06-26 17:14   ` [bug#64305] [PATCH 2/4] gnu: uwufetch: Manually create missing include dir Juliana Sims
2023-06-26 17:14   ` [bug#64305] [PATCH 3/4] gnu: uwufetch: Add missing propagated inputs Juliana Sims
2023-08-08 15:23     ` [bug#64305] [PATCH 0/4] Fixup uwufetch Ludovic Courtès
2023-08-10  1:20       ` [bug#65189] [PATCH] gnu: uwufetch: Add and use missing inputs Juliana Sims
2023-08-10  2:34         ` bug#65189: oops, emailed this wrong Juliana Sims
2023-08-10  2:37       ` Juliana Sims [this message]
2023-08-12 20:36         ` bug#64305: [PATCH] gnu: uwufetch: Add and use missing inputs Ludovic Courtès
2023-06-26 17:14   ` [bug#64305] [PATCH 4/4] gnu: uwufetch: Add supported-systems Juliana Sims
2023-07-27  4:03     ` Juliana Sims

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1b44a2db770f4f2a956c2235ea9cba3f0d1383a9.1691635036.git.juli@incana.org \
    --to=juli@incana.org \
    --cc=64305@debbugs.gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).