[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/07: build-system/cargo: Don't copy source as an output.
From: |
guix-commits |
Subject: |
03/07: build-system/cargo: Don't copy source as an output. |
Date: |
Tue, 11 Jun 2019 21:06:47 -0400 (EDT) |
marusich pushed a commit to branch guix-cargo
in repository guix.
commit d608e231e3c1c6db0e1e3db17c4435d3d7eb5969
Author: Ivan Petkov <address@hidden>
Date: Thu May 16 23:05:50 2019 -0700
build-system/cargo: Don't copy source as an output.
* guix/build-system/cargo.scm: (cargo-build)[build-expression->derivation]:
Don't add "src" output.
* guix/build/cargo-build-system.scm: (install-source): Delete it.
(%standard-phases): Delete 'install-source.
Signed-off-by: Chris Marusich <address@hidden>
---
guix/build-system/cargo.scm | 2 +-
guix/build/cargo-build-system.scm | 19 -------------------
2 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index 8283826..fa211d4 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -120,7 +120,7 @@ to NAME and VERSION."
#:inputs inputs
#:system system
#:modules imported-modules
- #:outputs (cons "src" outputs)
+ #:outputs outputs
#:guile-for-build guile-for-build))
(define (package-cargo-inputs p)
diff --git a/guix/build/cargo-build-system.scm
b/guix/build/cargo-build-system.scm
index b368074..1f36304 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -140,24 +140,6 @@ directory = '" port)
(define (touch file-name)
(call-with-output-file file-name (const #t)))
-(define* (install-source #:key inputs outputs #:allow-other-keys)
- "Install the source for a given Cargo package."
- (let* ((out (assoc-ref outputs "out"))
- (src (assoc-ref inputs "source"))
- (rsrc (string-append (assoc-ref outputs "src")
- "/share/rust-source")))
- (mkdir-p rsrc)
- ;; Rust doesn't have a stable ABI yet. Because of this
- ;; Cargo doesn't have a search path for binaries yet.
- ;; Until this changes we are working around this by
- ;; vendoring the crates' sources by symlinking them
- ;; to store paths.
- (copy-recursively "." rsrc)
- (touch (string-append rsrc "/.cargo-ok"))
- (generate-checksums rsrc)
- (install-file "Cargo.toml" rsrc)
- #t))
-
(define* (install #:key inputs outputs skip-build? #:allow-other-keys)
"Install a given Cargo package."
(let* ((out (assoc-ref outputs "out")))
@@ -179,7 +161,6 @@ directory = '" port)
(define %standard-phases
(modify-phases gnu:%standard-phases
(delete 'bootstrap)
- (add-before 'configure 'install-source install-source)
(replace 'configure configure)
(replace 'build build)
(replace 'check check)
- branch guix-cargo created (now 2444abd), guix-commits, 2019/06/11
- 03/07: build-system/cargo: Don't copy source as an output.,
guix-commits <=
- 06/07: gnu: crate: Add unicode-xid., guix-commits, 2019/06/11
- 02/07: build-system/cargo: Use sources from package sources., guix-commits, 2019/06/11
- 01/07: build-system/cargo: Expand transitive crate sources., guix-commits, 2019/06/11
- 04/07: doc: Update cargo-build-system parameter docs., guix-commits, 2019/06/11
- 07/07: gnu: crate: Add proc-macro2 and quote., guix-commits, 2019/06/11
- 05/07: import: crate: Define dependencies as arguments., guix-commits, 2019/06/11