me
/
guix
Archived
1
0
Fork 0
Code

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 <cmmarusich@gmail.com>
master
Ivan Petkov 2019-05-16 23:05:50 -07:00 committed by Chris Marusich
parent efdf2ae14e
commit d608e231e3
No known key found for this signature in database
GPG Key ID: DD409A15D822469D
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@ to NAME and VERSION."
#:inputs inputs #:inputs inputs
#:system system #:system system
#:modules imported-modules #:modules imported-modules
#:outputs (cons "src" outputs) #:outputs outputs
#:guile-for-build guile-for-build)) #:guile-for-build guile-for-build))
(define (package-cargo-inputs p) (define (package-cargo-inputs p)

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

@ -140,24 +140,6 @@ directory = '" port)
(define (touch file-name) (define (touch file-name)
(call-with-output-file file-name (const #t))) (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) (define* (install #:key inputs outputs skip-build? #:allow-other-keys)
"Install a given Cargo package." "Install a given Cargo package."
(let* ((out (assoc-ref outputs "out"))) (let* ((out (assoc-ref outputs "out")))
@ -179,7 +161,6 @@ directory = '" port)
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap) (delete 'bootstrap)
(add-before 'configure 'install-source install-source)
(replace 'configure configure) (replace 'configure configure)
(replace 'build build) (replace 'build build)
(replace 'check check) (replace 'check check)