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 /gnu/packages/rust-apps.scm | |
| 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 'gnu/packages/rust-apps.scm')
| -rw-r--r-- | gnu/packages/rust-apps.scm | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index af51c0fcfc..2c718a14f5 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -244,18 +244,8 @@ provides defaults for 80% of the use cases.") (install-file manpage (string-append (assoc-ref outputs "out") "/share/man/man1")))) - #t)) - (replace 'install - ;; Adapted from (guix build cargo-build-system). The flags need to - ;; be passed to `cargo install' too, as otherwise it will build - ;; another binary, without the features. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p out) - (setenv "CARGO_TARGET_DIR" "./target") - (invoke "cargo" "install" "--path" "." "--root" out - "--features" "pcre2"))))) - #:cargo-build-flags '("--release" "--features" "pcre2"))) + #t))) + #:features '("pcre2"))) (native-inputs `(("asciidoc" ,asciidoc) ("pcre2" ,pcre2) |