From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:39236) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j14gh-0006uc-Gi for guix-patches@gnu.org; Mon, 10 Feb 2020 03:45:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j14gg-0000YM-5p for guix-patches@gnu.org; Mon, 10 Feb 2020 03:45:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47673) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j14gg-0000Y6-28 for guix-patches@gnu.org; Mon, 10 Feb 2020 03:45:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j14gf-00017U-Ux for guix-patches@gnu.org; Mon, 10 Feb 2020 03:45:01 -0500 Subject: [bug#39445] [PATCH v2 2/2] gnu: ripgrep: enable the 'pcre2' feature Resent-Message-ID: Date: Mon, 10 Feb 2020 10:43:51 +0200 From: Efraim Flashner Message-ID: <20200210084351.GA26092@E5400> References: <20200209215110.6755-1-kuba@kadziolka.net> <20200209215110.6755-2-kuba@kadziolka.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="7AUc2qLy4jB3hD7Z" Content-Disposition: inline In-Reply-To: <20200209215110.6755-2-kuba@kadziolka.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Cc: 39445@debbugs.gnu.org --7AUc2qLy4jB3hD7Z Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Should the install phase also get the '--release' flag? On Sun, Feb 09, 2020 at 10:51:10PM +0100, Jakub K=C4=85dzio=C5=82ka 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(-) >=20 > 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 ne= ed to > + ;; be passed to `cargo install' too, as otherwise it will bui= ld > + ;; 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 > --=20 > 2.25.0 >=20 >=20 >=20 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --7AUc2qLy4jB3hD7Z Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl5BF8QACgkQQarn3Mo9 g1F/RA/+KZSD3nZ8hrgyS2hX5DvG7AqqqTAyPmerYTToaDfcs1OdJGISa9rACacc quFSr3syoXh6SZxDWMlGJP/In/7XG1pA5xmFoVsS0f3Ua+sHYYEOi/GJTDZ3Nni/ XUi5+Fj4qE3Ca5jdUbY4ADE0BwEGw5hlzIiu+uYTr6Nxdt3CnWLqZsupBeGUUuXL xqz8lrmtXoV67kr05t/9CIEhIK0CW+bWlL2V1a4udEB6EWtt+3ochSlFFy6z5CAL bdbjcaRBn14jRgluBgQH6MF8jzR5wU7LGG8VIRKwnWPzUanIMhGUSSywmsyBotg8 zDSnE/WMvl1nwU+a3l5c96TKlXb3paJbLpG7rESoRF4AkQJy5eyDTJgu19urG+yr NFHxs9/jgfNrcai3iH4v0SSTDNz9macnmwPyAy717WPi72IVsDmbM8WVJmSbqgim qIl1T9j19JcKIIUJqlOr2yHnc5aUsDOuX2PU8W/8W6r+bSRRklkQPwXnI1QDnECN J4a2Y001fOj7Lu80CNRKGUb9dZIhykdJi029XXixaVjuWpDXhcwwJUXw/o8Ht/8i K+nbb2sqTyCzYVfRkvrR/hBGK7gCu5DWon5z292IkJ6YszFYpZxf5UMz2eI8e9Zo GP2xnIubZ1ESdu71g924DTcfl07xaxrXySOgMsugCzOnvHHDQL4= =JgnP -----END PGP SIGNATURE----- --7AUc2qLy4jB3hD7Z--