diff options
| author | Ivan Petkov <ivanppetkov@gmail.com> | 2019-05-16 23:05:50 -0700 |
|---|---|---|
| committer | Chris Marusich <cmmarusich@gmail.com> | 2019-06-11 18:05:44 -0700 |
| commit | d608e231e3c1c6db0e1e3db17c4435d3d7eb5969 (patch) | |
| tree | 4a90e15a21c8556eb2d6b6cc7a0f0eb2e6f54620 | |
| parent | efdf2ae14eec429f5602ad03511ea5f7d8bc12b7 (diff) | |
| download | patches-d608e231e3c1c6db0e1e3db17c4435d3d7eb5969.tar patches-d608e231e3c1c6db0e1e3db17c4435d3d7eb5969.tar.gz | |
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>
| -rw-r--r-- | guix/build-system/cargo.scm | 2 | ||||
| -rw-r--r-- | guix/build/cargo-build-system.scm | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 828382678d..fa211d456d 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 b368074e8a..1f36304b15 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) |