diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-05-01 23:11:41 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-05-01 23:11:41 +0200 |
| commit | 3b458d5462e6bbd852c2dc5c6670d5655abf53f5 (patch) | |
| tree | 4f3ccec0de1c355134369333c17e948e3258d546 /guix/build-system/cargo.scm | |
| parent | 2ca3fdc2db1aef96fbf702a2f26f5e18ce832038 (diff) | |
| parent | 14da3daafc8dd92fdabd3367694c930440fd72cb (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build-system/cargo.scm')
| -rw-r--r-- | guix/build-system/cargo.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 7ff4e90f71..dc137421e9 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -59,13 +59,17 @@ to NAME and VERSION." (define %cargo-build-system-modules ;; Build-side modules imported by default. `((guix build cargo-build-system) + (json parser) ,@%cargo-utils-modules)) (define* (cargo-build store name inputs #:key (tests? #t) (test-target #f) + (vendor-dir "guix-vendor") (cargo-build-flags ''("--release")) + (cargo-test-flags ''("--release")) + (skip-build? #f) (phases '(@ (guix build cargo-build-system) %standard-phases)) (outputs '("out")) @@ -90,8 +94,11 @@ to NAME and VERSION." source)) #:system ,system #:test-target ,test-target + #:vendor-dir ,vendor-dir #:cargo-build-flags ,cargo-build-flags - #:tests? ,tests? + #:cargo-test-flags ,cargo-test-flags + #:skip-build? ,skip-build? + #:tests? ,(and tests? (not skip-build?)) #:phases ,phases #:outputs %outputs #:search-paths ',(map search-path-specification->sexp |