me
/
guix
Archived
1
0
Fork 0
Code

gnu: rust-1.55: Build with fewer packages. 

* gnu/packages/rust.scm (rust-1.55)[inputs]: Remove libssh2, curl.
[native-inputs]: Remove cmake-minimal, which.
(rust)[inputs]: Add curl.

Change-Id: Icf2355e0f84a50ea44bb057c6d6ccd89eead0191
master
Efraim Flashner 2024-01-10 08:38:40 +02:00
parent 64694083d5
commit f9a12c1e02
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/rust.scm
View File

@ -513,17 +513,13 @@ ar = \"" binutils "/bin/ar" "\"
`("LIBRARY_PATH" ":" `("LIBRARY_PATH" ":"
suffix (,(string-append libc "/lib")))))))))) suffix (,(string-append libc "/lib"))))))))))
(native-inputs (native-inputs
`(("cmake" ,cmake-minimal) `(("pkg-config" ,pkg-config)
("pkg-config" ,pkg-config) ; For "cargo"
("python" ,python-wrapper) ("python" ,python-wrapper)
("rustc-bootstrap" ,rust-bootstrap) ("rustc-bootstrap" ,rust-bootstrap)
("cargo-bootstrap" ,rust-bootstrap "cargo") ("cargo-bootstrap" ,rust-bootstrap "cargo")))
("which" ,which)))
(inputs (inputs
`(("llvm" ,llvm-13) `(("llvm" ,llvm-13)
("openssl" ,openssl) ("openssl" ,openssl)))
("libssh2" ,libssh2) ; For "cargo"
("libcurl" ,curl))) ; For "cargo"
;; rustc invokes gcc, so we need to set its search paths accordingly. ;; rustc invokes gcc, so we need to set its search paths accordingly.
;; Note: duplicate its value here to cope with circular dependencies among ;; Note: duplicate its value here to cope with circular dependencies among
;; modules (see <https://bugs.gnu.org/31392>). ;; modules (see <https://bugs.gnu.org/31392>).
@ -1073,6 +1069,9 @@ exec -a \"$0\" \"~a\" \"$@\""
"/lib/rustlib/src/rust/library") "/lib/rustlib/src/rust/library")
(string-append bin "/.rust-analyzer-real")))) (string-append bin "/.rust-analyzer-real"))))
(chmod (string-append bin "/rust-analyzer") #o755)))))))) (chmod (string-append bin "/rust-analyzer") #o755))))))))
(inputs
(modify-inputs (package-inputs base-rust)
(prepend curl)))
;; Add test inputs. ;; Add test inputs.
(native-inputs (cons* `("gdb" ,gdb/pinned) (native-inputs (cons* `("gdb" ,gdb/pinned)
`("procps" ,procps) `("procps" ,procps)