diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-03-06 22:34:53 +0100 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-03-23 19:30:38 +0100 |
| commit | 927c2518465579d48315e8e6b5102097c146fece (patch) | |
| tree | 5c655c1d87ff1fb723b8ea52c2d4115c46373a38 /guix/build-system | |
| parent | 34ad1a550c935e98aac2588f02dbfbfb7b5fad0c (diff) | |
| download | guix-patches-927c2518465579d48315e8e6b5102097c146fece.tar guix-patches-927c2518465579d48315e8e6b5102097c146fece.tar.gz | |
cargo-build-system: Accept a #:features argument
* guix/build/cargo-build-system.scm (build, install): Pass the features
to cargo.
(check): Remove indirection layer for consistency with build and
install.
* guix/build-system/cargo.scm (cargo-build): New argument; pass it into
the builder.
* gnu/packages/rust-apps.scm (ripgrep): Use the new argument instead of
a custom phase.
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/cargo.scm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 1e8b3a578e..6c8edf6bac 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> +;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,6 +77,7 @@ to NAME and VERSION." (vendor-dir "guix-vendor") (cargo-build-flags ''("--release")) (cargo-test-flags ''("--release")) + (features ''()) (skip-build? #f) (phases '(@ (guix build cargo-build-system) %standard-phases)) @@ -104,6 +106,7 @@ to NAME and VERSION." #:vendor-dir ,vendor-dir #:cargo-build-flags ,cargo-build-flags #:cargo-test-flags ,cargo-test-flags + #:features ,features #:skip-build? ,skip-build? #:tests? ,(and tests? (not skip-build?)) #:phases ,phases |