git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #113178 from danieldk/ripgrep-pcre2-shared

ripgrep: link PCRE2 dynamically

commite108c2a998c26a03358a2557724a658d011393b5 authorMaximilian Bosch <maximilian@mbosch.me> dateMon 15 Feb 2021, 10:21 (6 years ago) parent859d540797b60f
1 file changed+4−2
pkgs/tools/text/ripgrep/default.nix+4−2
pkgs/tools/text/ripgrep/default.nix+4−2
@@ -4,6 +4,7 @@
44, rustPlatform
55, asciidoctor
66, installShellFiles
7+, pkg-config
78, Security
89, withPCRE2 ? true
910, pcre2 ? null
@@ -24,9 +25,10 @@ rustPlatform.buildRustPackage rec {
2425
2526 cargoBuildFlags = lib.optional withPCRE2 "--features pcre2";
2627
27− nativeBuildInputs = [ asciidoctor installShellFiles ];
28+ nativeBuildInputs = [ asciidoctor installShellFiles ]
29+ ++ lib.optional withPCRE2 pkg-config;
2830 buildInputs = (lib.optional withPCRE2 pcre2)
29− ++ (lib.optional stdenv.isDarwin Security);
31+ ++ (lib.optional stdenv.isDarwin Security);
3032
3133 preFixup = ''
3234 installManPage $releaseDir/build/ripgrep-*/out/rg.1