unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / Atom feed
* bug#51798: bashtop does not run without glibc installed in profile
@ 2021-11-12 22:55 Lenny Händler
  2021-11-14 14:01 ` bug#51798: [PATCH] gnu: bashtop: Add dependencies and wrap program with PATH Josselin Poiret via Bug reports for GNU Guix
  0 siblings, 1 reply; 4+ messages in thread
From: Lenny Händler @ 2021-11-12 22:55 UTC (permalink / raw)
  To: 51798

the script needs both uname and locale. If glibc is not installed in 
profile, it aborts. However glibc is not listed as a dependency. When I 
install glibc it works.





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

* bug#51798: [PATCH] gnu: bashtop: Add dependencies and wrap program with PATH
  2021-11-12 22:55 bug#51798: bashtop does not run without glibc installed in profile Lenny Händler
@ 2021-11-14 14:01 ` Josselin Poiret via Bug reports for GNU Guix
  2021-11-14 15:19   ` bug#51798: [PATCH v2] " Josselin Poiret via Bug reports for GNU Guix
  0 siblings, 1 reply; 4+ messages in thread
From: Josselin Poiret via Bug reports for GNU Guix @ 2021-11-14 14:01 UTC (permalink / raw)
  To: Lenny Händler, 51798; +Cc: Josselin Poiret

You're right, none of the needed dependencies of bashtop were
actually present in the package definition.  Here is a patch that
does work on my machine using `guix shell --pure bashtop -- bashtop`.

Best,
Josselin Poiret
-- >8 --

* gnu/packages/admin.scm (bashtop): Add dependencies, wrap the script
so that it can access the commands it needs.
---
 gnu/packages/admin.scm | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 2a7b0f310d..8f9125212c 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -71,6 +71,7 @@ (define-module (gnu packages admin)
   #:use-module (guix build-system python)
   #:use-module (guix build-system ruby)
   #:use-module (guix build-system trivial)
+  #:use-module (guix build-system copy)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
@@ -670,11 +671,29 @@ (define-public bashtop
               (sha256
                (base32
                 "07nlr6vmyb7yihaxj1fp424lmhwkdjl6mls92v90f6gsvikpa13v"))))
-    (build-system gnu-build-system)
+    (build-system copy-build-system)
     (arguments
-     '(#:make-flags (list (string-append "PREFIX=" %output))
-       #:tests? #f      ; bats test fails with loading load.bash
-       #:phases (modify-phases %standard-phases (delete 'configure))))
+     '(#:install-plan '(("./bashtop" "./bin/bashtop"))
+       #:phases (modify-phases %standard-phases
+		  (add-after 'install 'wrap
+	            (lambda* (#:key outputs #:allow-other-keys)
+		      (let ((paths (map (lambda (program)
+					  (dirname (which program)))
+					'("awk" "dd" "grep" "ip"
+					  "locale" "ps" "sed")))
+			    (bashtop (string-append (assoc-ref outputs
+							       "out")
+						    "/bin/bashtop")))
+			(wrap-program bashtop
+				      `("PATH" ":" = ,paths))))))))
+    (inputs
+     `(("coreutils" ,coreutils)
+       ("gawk" ,gawk)
+       ("glibc" ,glibc) ; for 'locale'
+       ("grep" ,grep)
+       ("iproute" ,iproute)
+       ("procps" ,procps)
+       ("sed" ,sed)))
     (home-page "https://github.com/aristocratos/bashtop")
     (synopsis "Linux/OSX/FreeBSD resource monitor")
     (description "Resource monitor that shows usage and stats for processor,
-- 
2.33.1





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

* bug#51798: [PATCH v2] gnu: bashtop: Add dependencies and wrap program with PATH
  2021-11-14 14:01 ` bug#51798: [PATCH] gnu: bashtop: Add dependencies and wrap program with PATH Josselin Poiret via Bug reports for GNU Guix
@ 2021-11-14 15:19   ` Josselin Poiret via Bug reports for GNU Guix
  2021-11-14 21:33     ` Maxime Devos
  0 siblings, 1 reply; 4+ messages in thread
From: Josselin Poiret via Bug reports for GNU Guix @ 2021-11-14 15:19 UTC (permalink / raw)
  To: Lenny Händler, 51798; +Cc: Josselin Poiret

Sorry for the noise, but the patch I just sent wasn't up to
satisfaction: using `which` in the build phases breaks
cross-compilation, and the build-system change was a bit of an
unwarranted change.

Here's a modified patch!

Best,
Josselin Poiret
-- >8 --

* gnu/packages/admin.scm (bashtop): Add dependencies, wrap the script
so that it can access the commands it needs.
---
 gnu/packages/admin.scm | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 2a7b0f310d..fe3987a9b8 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -674,7 +674,29 @@ (define-public bashtop
     (arguments
      '(#:make-flags (list (string-append "PREFIX=" %output))
        #:tests? #f      ; bats test fails with loading load.bash
-       #:phases (modify-phases %standard-phases (delete 'configure))))
+       #:phases (modify-phases %standard-phases
+                  (delete 'configure)
+		  (add-after 'install 'wrap
+	            (lambda* (#:key inputs outputs #:allow-other-keys)
+		      (let ((path (map (lambda (input)
+					 (string-append (assoc-ref inputs
+								   input)
+							"/bin"))
+				       '("coreutils" "gawk" "glibc" "grep"
+					 "iproute" "procps" "sed")))
+			    (bashtop (string-append (assoc-ref outputs
+							       "out")
+						    "/bin/bashtop")))
+			(wrap-program bashtop
+				      `("PATH" ":" = ,path))))))))
+    (inputs
+     `(("coreutils" ,coreutils)
+       ("gawk" ,gawk)
+       ("glibc" ,glibc) ; needed for the 'locale' binary
+       ("grep" ,grep)
+       ("iproute" ,iproute)
+       ("procps" ,procps)
+       ("sed" ,sed)))
     (home-page "https://github.com/aristocratos/bashtop")
     (synopsis "Linux/OSX/FreeBSD resource monitor")
     (description "Resource monitor that shows usage and stats for processor,
-- 
2.33.1





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

* bug#51798: [PATCH v2] gnu: bashtop: Add dependencies and wrap program with PATH
  2021-11-14 15:19   ` bug#51798: [PATCH v2] " Josselin Poiret via Bug reports for GNU Guix
@ 2021-11-14 21:33     ` Maxime Devos
  0 siblings, 0 replies; 4+ messages in thread
From: Maxime Devos @ 2021-11-14 21:33 UTC (permalink / raw)
  To: Josselin Poiret, Lenny Händler, 51798

Josselin Poiret via Bug reports for GNU Guix schreef op zo 14-11-2021
om 15:19 [+0000]:
> +                       (wrap-program bashtop

The input "bash-minimal" is missing. Adding that input is required
for cross-compilation (otherwise a native bash instead of a bash
for the target is used). It should be reported by guix lint.

Greetings,
Maxime.

-- 
not hacking on guix for a while, only occassionally looking at IRC logs
and bug reports.  E-mails are unsigned until backup is located.






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

end of thread, other threads:[~2021-11-14 21:34 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-12 22:55 bug#51798: bashtop does not run without glibc installed in profile Lenny Händler
2021-11-14 14:01 ` bug#51798: [PATCH] gnu: bashtop: Add dependencies and wrap program with PATH Josselin Poiret via Bug reports for GNU Guix
2021-11-14 15:19   ` bug#51798: [PATCH v2] " Josselin Poiret via Bug reports for GNU Guix
2021-11-14 21:33     ` Maxime Devos

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).