16/51: gnu: linux: Add 'bash' input for 'wrap-program'.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 5234725ff3a67342ab26573cf3399cc40a6b972a
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Jul 2 12:07:30 2021 +0200

    gnu: linux: Add 'bash' input for 'wrap-program'.
    
    It is required for cross-compilation.
    
    * gnu/packages/linux.scm
    (kbd)[inputs]: Add 'bash-minimal'.
    (singularity)[inputs]: Likewise.
    (bcc)[inputs]: Likewise.
    
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
    Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
    Change-Id: I5586d61c683f8f1f48f9d28590f088023572b2b8
---
 gnu/packages/linux.scm | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 5edcde3853..692844c7da 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4094,7 +4094,8 @@ NUMA performance on your system.")
     (native-inputs
      (list autoconf pkg-config))
     (inputs
-     `(("bzip2" ,bzip2)
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ("bzip2" ,bzip2)
        ("gzip" ,gzip)
        ("pam" ,linux-pam)
        ("xz" ,xz)
@@ -5207,7 +5208,8 @@ thanks to the use of namespaces.")
                                  out "/bin/singularity")))
                #t))))))
     (inputs
-     `(("libarchive" ,libarchive)
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ("libarchive" ,libarchive)
        ("python" ,python-wrapper)
        ("zlib" ,zlib)
        ("squashfs-tools" ,squashfs-tools)))
@@ -9554,14 +9556,15 @@ headers.")
     (native-inputs
      (list bison flex))
     (inputs
-     `(("clang-toolchain" ,clang-toolchain-9)
-       ("libbpf" ,(package-source libbpf))
-       ;; LibElf required but libelf does not contain
-       ;; archives, only object files.
-       ;; https://github.com/iovisor/bcc/issues/504
-       ("elfutils" ,elfutils)
-       ("luajit" ,luajit)
-       ("python-wrapper" ,python-wrapper)))
+     (list bash-minimal                 ;for wrap-program
+           clang-toolchain-9
+           (package-source libbpf)
+           ;; LibElf required but libelf does not contain
+           ;; archives, only object files.
+           ;; https://github.com/iovisor/bcc/issues/504
+           elfutils
+           luajit
+           python-wrapper))
     (arguments
      `(;; Tests all require root permissions and a "standard" file hierarchy.
        #:tests? #f
@@ -9604,8 +9607,7 @@ headers.")
                                        ,(version-major+minor
                                          (package-version python))
                                        "/site-packages")))))
-                (find-files tools python-executable?))
-               #t))))))
+                (find-files tools python-executable?))))))))
     (home-page "https://github.com/iovisor/bcc";)
     (synopsis "Tools for BPF on Linux")
     (description