guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: guix-commits
Subject: 51/51: gnu: rust: Add 'bash' input for 'wrap-program'.
Date: Sat, 21 Oct 2023 15:19:35 -0400 (EDT)

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

commit 1d17861e8783f28f161376cefdbca0c5d1a2d7a8
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Jul 2 12:13:24 2021 +0200

    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
---
 gnu/packages/rust.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 38db41549a..54dcc4cc6b 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -34,6 +34,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)
@@ -178,7 +179,8 @@
                   (max-silent-time . 18000))) ;5 hours (for armel)
     (build-system gnu-build-system)
     (inputs
-     `(("libcurl" ,curl)
+     `(("bash-minimal" ,bash-minimal)
+       ("libcurl" ,curl)
        ("llvm" ,llvm-13)
        ("openssl" ,openssl-1.1)
        ("zlib" ,zlib)))
@@ -526,7 +528,8 @@ ar = \"" binutils "/bin/ar" "\"
        ("cargo-bootstrap" ,rust-bootstrap "cargo")
        ("which" ,which)))
     (inputs
-     `(("jemalloc" ,jemalloc)
+     `(("bash" ,bash-minimal)           ; For wrap-program
+       ("jemalloc" ,jemalloc)
        ("llvm" ,llvm-13)
        ("openssl" ,openssl)
        ("libssh2" ,libssh2)             ; For "cargo"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]