guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

41/41: gnu: ripgrep: Enable the 'pcre2' feature.


From: guix-commits
Subject: 41/41: gnu: ripgrep: Enable the 'pcre2' feature.
Date: Tue, 11 Feb 2020 13:24:55 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit d883e791b79e919796c03a88688c91b4b17550ea
Author: Jakub Kądziołka <address@hidden>
AuthorDate: Sun Feb 9 22:51:10 2020 +0100

    gnu: ripgrep: Enable the 'pcre2' feature.
    
    * gnu/packages/rust-apps.scm (ripgrep)[arguments]: Add
    '#:cargo-build-flags' to specify the feature. Replace 'install phase.
    [native-inputs]: Add pcre2, pkg-config.
    
    Signed-off-by: Efraim Flashner <address@hidden>
---
 gnu/packages/rust-apps.scm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index ddc9f6e..ac50f95 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -27,6 +27,7 @@
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages jemalloc)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control))
@@ -242,9 +243,22 @@ 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)
+       ("pcre2" ,pcre2)
+       ("pkg-config" ,pkg-config)))
     (home-page "https://github.com/BurntSushi/ripgrep";)
     (synopsis "Line-oriented search tool")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]