From: "Jakub Kądziołka" <kuba@kadziolka.net>
To: 39445@debbugs.gnu.org
Subject: [bug#39445] [PATCH v2 2/2] gnu: ripgrep: enable the 'pcre2' feature
Date: Sun, 9 Feb 2020 22:51:10 +0100 [thread overview]
Message-ID: <20200209215110.6755-2-kuba@kadziolka.net> (raw)
In-Reply-To: <20200209215110.6755-1-kuba@kadziolka.net>
* gnu/packages/rust-apps.scm (ripgrep)[arguments]: Add
#:cargo-build-flags to specify the feature. Replace the 'install phase
to work around the cargo-build-system a bit.
---
gnu/packages/rust-apps.scm | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index ddc9f6ed37..26b5445d98 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -242,9 +242,21 @@ provides defaults for 80% of the use cases.")
(install-file manpage (string-append
(assoc-ref outputs "out")
"/share/man/man1"))))
- #t)))))
+ #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")))
(native-inputs
- `(("asciidoc" ,asciidoc)))
+ `(("asciidoc" ,asciidoc)
+ ,@(package-native-inputs rust-pcre2-sys-0.2)))
(home-page "https://github.com/BurntSushi/ripgrep")
(synopsis "Line-oriented search tool")
(description
--
2.25.0
next prev parent reply other threads:[~2020-02-09 21:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 21:36 [bug#39445] [PATCH] gnu: ripgrep: Install the manpage Jakub Kądziołka
2020-02-09 21:51 ` [bug#39445] [PATCH v2 1/2] " Jakub Kądziołka
2020-02-09 21:51 ` Jakub Kądziołka [this message]
2020-02-10 8:43 ` [bug#39445] [PATCH v2 2/2] gnu: ripgrep: enable the 'pcre2' feature Efraim Flashner
2020-02-10 11:28 ` Jakub Kądziołka
2020-02-11 18:25 ` bug#39445: " Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200209215110.6755-2-kuba@kadziolka.net \
--to=kuba@kadziolka.net \
--cc=39445@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.