[bug#39445] [PATCH v2 2/2] gnu: ripgrep: enable the 'pcre2' feature

[Efraim Flashner <efraim@flashner.co.il>]

[-- Attachment #1: Type: text/plain, Size: 2093 bytes --]

Should the install phase also get the '--release' flag?

On Sun, Feb 09, 2020 at 10:51:10PM +0100, Jakub Kądziołka wrote:
> * 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
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]