~ruther/guix-local: gnu: rust: Add 'bash' input for 'wrap-program'.

90f7b095500c712394f9cb2502c03701e30fdc0a — Maxime Devos 4 years ago 7c702d7

gnu: rust: Add 'bash' input for 'wrap-program'.

It is required for cross-compilation.

* gnu/packages/rust.scm
(rust-bootstrap)[inputs]: Add 'bash-minimal'.
(rust-1.55)[inputs]: Likewise.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I8f0f71b236504d6a2e04c5823fbf20f926485992

patch browse .tar.gz

1 files changed, 5 insertions(+), 2 deletions(-)

M gnu/packages/rust.scm

M gnu/packages/rust.scm => gnu/packages/rust.scm +5 -2

@@ 36,6 36,7 @@
 
 (define-module (gnu packages rust)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages bootstrap)
   #:use-module (gnu packages cmake)


@@ 185,7 186,8 @@
                   (max-silent-time . 18000))) ;5 hours (for armel)
     (build-system gnu-build-system)
     (inputs
-     `(,@(if (or (target-ppc64le?)
+     `(("bash-minimal" ,bash-minimal)
+       ,@(if (or (target-ppc64le?)
                  (target-riscv64?))
              `(("clang" ,clang-13))
              `())


@@ 539,7 541,8 @@ ar = \"" binutils "/bin/ar" "\"
        ("rustc-bootstrap" ,rust-bootstrap)
        ("cargo-bootstrap" ,rust-bootstrap "cargo")))
     (inputs
-     `(("llvm" ,llvm-13)
+     `(("bash" ,bash-minimal)
+       ("llvm" ,llvm-13)
        ("openssl" ,openssl)))
     ;; rustc invokes gcc, so we need to set its search paths accordingly.
     (native-search-paths