Merge pull request #121597 from SuperSandro2000/ripgrep

ripgrep: cleanup
This commit is contained in:
Sandro 2021-05-03 17:34:05 +02:00 committed by GitHub
commit 69652a072d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -6,7 +6,7 @@
, pkg-config
, Security
, withPCRE2 ? true
, pcre2 ? null
, pcre2
}:
rustPlatform.buildRustPackage rec {
@ -26,8 +26,8 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ asciidoctor installShellFiles ]
++ lib.optional withPCRE2 pkg-config;
buildInputs = (lib.optional withPCRE2 pcre2)
++ (lib.optional stdenv.isDarwin Security);
buildInputs = lib.optional withPCRE2 pcre2
++ lib.optional stdenv.isDarwin Security;
preFixup = ''
installManPage $releaseDir/build/ripgrep-*/out/rg.1