summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2017-04-14 00:04:02 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2017-04-21 10:18:23 +0200
commitf0eb0a4bb13bb11f6660a22f3acc2f45567c0dc0 (patch)
tree8a2d89362a35ff3bd4a08c7a67faface929083ed /gnu
parent002c3e6dd6709ba47823214111aa56aa6e0670c6 (diff)
gnu: cargo: Simplify unpacking.
Fixes <http://bugs.gnu.org/26166>. * gnu/packages/rust.scm (cargo) [arguments]<:modules>: Add (srfi srfi-1). [arguments]<:phases>: Adapt 'unpack-submodule-sources' phase to more clearly seperate the tasks it does. Add helper procedures 'unpack', 'touch', 'install-rust-library'. [arguments]<:phases>: Rename 'set-cargo-home' to 'set-environment-up' and make it use official cargo directories. [arguments]<:phases>: Remove 'configure' phase.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/rust.scm56
1 files changed, 35 insertions, 21 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index a9710ba4d7..1217ec71ff 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -301,6 +301,8 @@ safety and thread safety guarantees.")
;; Dual licensed.
(license (list license:asl2.0 license:expat))))
+;; This tries very hard not to get into a cyclic dependency like this:
+;; cargo <- cargo-build-system <- cargo.
(define-public cargo
(package
(name "cargo")
@@ -825,6 +827,11 @@ safety and thread safety guarantees.")
(arguments
`(#:cargo ,cargo-bootstrap
#:tests? #f ; FIXME
+ #:modules
+ ((ice-9 match)
+ (srfi srfi-1) ; 'every
+ (guix build utils)
+ (guix build cargo-build-system))
#:phases
(modify-phases %standard-phases
;; Avoid cargo complaining about missmatched checksums.
@@ -833,30 +840,36 @@ safety and thread safety guarantees.")
(delete 'patch-usr-bin-file)
(add-after 'unpack 'unpack-submodule-sources
(lambda* (#:key inputs #:allow-other-keys)
- (let ((unpack (lambda (source target)
- (mkdir-p target)
- (with-directory-excursion target
- (zero? (system* "tar" "xf"
- source
- "--strip-components=1"))))))
+ (define (unpack source target)
+ (mkdir-p target)
+ (with-directory-excursion target
+ (zero? (system* "tar" "xf"
+ source
+ "--strip-components=1"))))
+ (define (touch file-name)
+ (call-with-output-file file-name (const #t)))
+ (define (install-rust-library entry)
+ (match entry
+ ((name . src)
+ (if (string-prefix? "rust-" name)
+ (let* ((rust-length (string-length "rust-"))
+ (rust-name (string-drop name
+ rust-length))
+ (rsrc (string-append "vendor/"
+ rust-name))
+ (unpack-status (unpack src rsrc)))
+ (touch (string-append rsrc "/.cargo-ok"))
+ (generate-checksums rsrc src)
+ unpack-status)))
+ (_ #t)))
(mkdir "vendor")
- (for-each (lambda (p)
- (let ((name (car p)))
- (if (string-prefix? "rust-" name)
- (let ((rsrc (string-append "vendor/"
- (string-drop name
- (string-length "rust-")))))
- (unpack (assoc-ref inputs name) rsrc)
- (system* "touch" (string-append rsrc "/.cargo-ok"))
- (generate-checksums rsrc (assoc-ref inputs name)))))) inputs))))
- ;; Set CARGO_HOME to use the vendored dependencies.
- (add-after 'unpack 'set-cargo-home
+ (every install-rust-library inputs)))
+ (add-after 'unpack 'set-environment-up
(lambda* (#:key inputs #:allow-other-keys)
(let* ((gcc (assoc-ref inputs "gcc"))
(cc (string-append gcc "/bin/gcc")))
- (mkdir "cargohome")
- (setenv "CARGO_HOME" (string-append (getcwd) "/cargohome"))
- (call-with-output-file "cargohome/config"
+ (mkdir ".cargo")
+ (call-with-output-file ".cargo/config"
(lambda (p)
(format p "
[source.crates-io]
@@ -868,7 +881,8 @@ directory = 'vendor'
")))
(setenv "CMAKE_C_COMPILER" cc)
(setenv "CC" cc))
- #t)))))
+ #t))
+ (delete 'configure))))
(home-page "https://github.com/rust-lang/cargo")
(synopsis "Build tool and package manager for Rust")
(description "Cargo is a tool that allows Rust projects to declare their