all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#74446] [PATCH] gnu: liquidprompt: Patch additional utilities
@ 2024-11-20 16:29 Sisiutl
  2024-11-29 13:37 ` bug#74446: " Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: Sisiutl @ 2024-11-20 16:29 UTC (permalink / raw)
  To: 74446; +Cc: Sisiutl

* 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





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#74446: [PATCH] gnu: liquidprompt: Patch additional utilities
  2024-11-20 16:29 [bug#74446] [PATCH] gnu: liquidprompt: Patch additional utilities Sisiutl
@ 2024-11-29 13:37 ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2024-11-29 13:37 UTC (permalink / raw)
  To: Sisiutl; +Cc: 74446-done

Sisiutl <sisiutl@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!




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-11-29 13:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-20 16:29 [bug#74446] [PATCH] gnu: liquidprompt: Patch additional utilities Sisiutl
2024-11-29 13:37 ` bug#74446: " Ludovic Courtès

Code repositories for project(s) associated with this external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.