guix_mirror_bot pushed a commit to branch rust-team
in repository guix.
commit 9b5afcb7779acfe222e1e520ce10164ecdb22a41
Author: Efraim Flashner <[email protected]>
AuthorDate: Fri Apr 17 13:03:18 2026 +0300
gnu: rust: Remove input labels.
* gnu/packages/rust.scm (rust)[native-inputs]: Remove input labels.
[arguments]: Adjust phases accordingly.
Fixes: guix/guix#7889
Change-Id: I05aa5d846b2ee4ed374a62a89d1ae3ab979e236c
---
gnu/packages/rust.scm | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 1643abb4c7..d9a0d3079f 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -2049,15 +2049,13 @@ ge13ca993e8ccb9ba9847cc330696e02839f328f7/jemalloc"))
(lambda* (#:key inputs #:allow-other-keys)
(mkdir-p "src/llvm-project/compiler-rt")
(copy-recursively
- (string-append (assoc-ref inputs "clang-source")
- "/compiler-rt")
+ (search-input-directory inputs "/compiler-rt")
"src/llvm-project/compiler-rt")))
(add-after 'unpack 'unpack-libunwind
(lambda* (#:key inputs #:allow-other-keys)
(mkdir-p "src/llvm-project/libunwind")
(copy-recursively
- (string-append (assoc-ref inputs "clang-source")
- "/libunwind")
+ (search-input-directory inputs "/libunwind")
"src/llvm-project/libunwind")))
(replace 'patch-cargo-checksums
(lambda _
@@ -2189,14 +2187,15 @@ exec -a \"$0\" \"~a\" \"$@\""
"/lib/rustlib/src/rust/library")
(string-append bin "/.rust-analyzer-real"))))
(chmod (string-append bin "/rust-analyzer") #o755))))))))
- (native-inputs (cons*
- ;; Keep in sync with the llvm used to build rust.
- `("clang-source" ,(package-source clang-runtime-21))
- ;; Add test inputs.
- `("gdb" ,gdb/pinned)
- `("git-minimal" ,git-minimal/pinned)
- `("procps" ,procps)
- (package-native-inputs base-rust)))
+ (native-inputs
+ (modify-inputs (package-native-inputs base-rust)
+ (prepend
+ ;; Keep in sync with the llvm used to build rust.
+ (package-source clang-runtime-21)
+ ;; Add test inputs.
+ gdb/pinned
+ git-minimal/pinned
+ procps)))
(native-search-paths
(cons*
;; For HTTPS access, Cargo reads from a single-file certificate
