[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#39445] [PATCH v2 2/2] gnu: ripgrep: enable the 'pcre2' feature
From: |
Jakub Kądziołka |
Subject: |
[bug#39445] [PATCH v2 2/2] gnu: ripgrep: enable the 'pcre2' feature |
Date: |
Sun, 9 Feb 2020 22:51:10 +0100 |
* 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