diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-03-19 18:52:01 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-03-19 18:52:12 -0400 |
| commit | f67337e23ec16b1e05fcdcc7953f68f13ed6770a (patch) | |
| tree | 766e98a6c4695228f0a066accf91f639791dad68 /guix/build-system | |
| parent | b99eec83b861f6bee7afb7bd6ffcbdddd8f62b65 (diff) | |
| parent | e05fc441cd5528ba6c83b6371c27c1e87dd393e9 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/cargo.scm | 3 | ||||
| -rw-r--r-- | guix/build-system/r.scm | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 578c4446a4..c637fbb162 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -64,7 +64,7 @@ to NAME and VERSION." #:key (tests? #t) (test-target #f) - (configure-flags #f) + (cargo-build-flags ''("--release")) (phases '(@ (guix build cargo-build-system) %standard-phases)) (outputs '("out")) @@ -89,6 +89,7 @@ to NAME and VERSION." source)) #:system ,system #:test-target ,test-target + #:cargo-build-flags ,cargo-build-flags #:tests? ,tests? #:phases ,phases #:outputs %outputs diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index e8269fdeb1..c649036210 100644 --- a/guix/build-system/r.scm +++ b/guix/build-system/r.scm @@ -62,7 +62,7 @@ release corresponding to NAME and VERSION." "Return the default R package." ;; Lazily resolve the binding to avoid a circular dependency. (let ((r-mod (resolve-interface '(gnu packages statistics)))) - (module-ref r-mod 'r))) + (module-ref r-mod 'r-minimal))) (define* (lower name #:key source inputs native-inputs outputs system target |