public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #113178 from danieldk/ripgrep-pcre2-shared 

ripgrep: link PCRE2 dynamically
This commit is contained in:
Maximilian Bosch 2021-02-15 10:21:54 +01:00 committed by GitHub
parent 859d540508 797b60f0d7
commit e108c2a998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/text/ripgrep/default.nix
View File

@ -4,6 +4,7 @@
, rustPlatform , rustPlatform
, asciidoctor , asciidoctor
, installShellFiles , installShellFiles
, pkg-config
, Security , Security
, withPCRE2 ? true , withPCRE2 ? true
, pcre2 ? null , pcre2 ? null
@ -24,9 +25,10 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = lib.optional withPCRE2 "--features pcre2"; cargoBuildFlags = lib.optional withPCRE2 "--features pcre2";
nativeBuildInputs = [ asciidoctor installShellFiles ]; nativeBuildInputs = [ asciidoctor installShellFiles ]
++ lib.optional withPCRE2 pkg-config;
buildInputs = (lib.optional withPCRE2 pcre2) buildInputs = (lib.optional withPCRE2 pcre2)
++ (lib.optional stdenv.isDarwin Security); ++ (lib.optional stdenv.isDarwin Security);
preFixup = '' preFixup = ''
installManPage $releaseDir/build/ripgrep-*/out/rg.1 installManPage $releaseDir/build/ripgrep-*/out/rg.1