nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-system: cargo: Use correct cargo. 

* gnu/packages/rust.scm (cargo-bootstrap): Make private.
* guix/build-system/cargo.scm (default-cargo): Use cargo.
This commit is contained in:
David Craven 2016-12-29 16:28:47 +01:00
parent b5a09649db
commit 3b7ccbe94c
No known key found for this signature in database
GPG Key ID: C5E051C79C0BECDB
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/rust.scm
View File

@ -122,9 +122,7 @@
which can in turn be used to build the final Rust compiler.")
(license license:asl2.0)))
;; FIXME: Make private once cargo is packaged. Is currently used by the
;; cargo-build-system.
(define-public cargo-bootstrap
(define cargo-bootstrap
(package
(name "cargo-bootstrap")
(version (cargo-version %rust-bootstrap-binaries-version))

3
guix/build-system/cargo.scm
View File

@ -46,8 +46,7 @@ to NAME and VERSION."
"Return the default Cargo package."
;; Lazily resolve the binding to avoid a circular dependency.
(let ((rust (resolve-interface '(gnu packages rust))))
;; FIXME: Package cargo and replace cargo-bootstrap with cargo.
(module-ref rust 'cargo-bootstrap)))
(module-ref rust 'cargo)))
(define (default-rustc)
"Return the default Rustc package."