GNU bug report logs - #74446
[PATCH] gnu: liquidprompt: Patch additional utilities

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 74446 in the body.
You can then email your comments to 74446 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Sisiutl <sisiutl <at> egregore.fun>
To: guix-patches <at> gnu.org
Cc: Sisiutl <sisiutl <at> egregore.fun>
Subject: [PATCH] gnu: liquidprompt: Patch additional utilities
Date: Wed, 20 Nov 2024 17:29:30 +0100

* gnu/packages/shellutils.scm (liquidprompt)
[inputs]: Add coreutils and inetutils.
[arguments]<#:phases>: Replace the paths of more utilites

Change-Id: I84578ca40300a7527a23e5d8c3257d49be911a7b
---
 gnu/packages/shellutils.scm | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 7e9f85a5f2..74e9429de0 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -47,6 +47,7 @@ (define-module (gnu packages shellutils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system python)
+  #:use-module (gnu packages admin)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
@@ -946,14 +947,19 @@ (define-public liquidprompt
                           (string-append "source "
                                          #$output
                                          "/share/liquidprompt/liquidprompt")))))
-		   (add-after 'fix-plugin 'fix-tput-path
-		     (lambda* (#:key inputs #:allow-other-keys)
-		       (substitute* "liquidprompt"
-			 (("([ (])tput " all beginning)
+                   (add-after 'fix-plugin 'fix-utils-path
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       (substitute* "liquidprompt"
+                         (("([ (])\\\\?(tput|hostname|cksum|uname|tty|grep)([) ])"
+                           all beginning command ending)
                           (string-append beginning
-                                         (search-input-file inputs "bin/tput")
-                                         " "))))))))
-    (inputs (list ncurses))
+                                         (search-input-file
+                                          inputs
+                                          (string-append "bin/" command))
+                                         ending))))))))
+    (inputs (list ncurses
+                  coreutils
+                  inetutils))
     (synopsis "Full-featured prompt for Bash & Zsh")
     (description
      "Liquidprompt is an adaptive prompt for Bash and Zsh that gives
-- 
2.46.0

Message #10 received at 74446-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Sisiutl <sisiutl <at> egregore.fun>
Cc: 74446-done <at> debbugs.gnu.org
Subject: Re: [bug#74446] [PATCH] gnu: liquidprompt: Patch additional utilities
Date: Fri, 29 Nov 2024 14:37:18 +0100

Sisiutl <sisiutl <at> egregore.fun> skribis:

> * gnu/packages/shellutils.scm (liquidprompt)
> [inputs]: Add coreutils and inetutils.
> [arguments]<#:phases>: Replace the paths of more utilites
>
> Change-Id: I84578ca40300a7527a23e5d8c3257d49be911a7b

Applied, thanks!

Previous Next

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