diff options
author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2023-11-29 20:18:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-29 20:18:08 +0100 |
commit | 9ecf38f085148242edd6c65875e8dd9eecfb9b75 (patch) | |
tree | 639ef13ed0f6079d35774aa231d8004efda2397d | |
parent | 758560ef7be6511f47271367a367ddf39bc6a63f (diff) | |
parent | 2319f134fb6491527d95c61e5b9335f2d642d717 (diff) | |
download | nixlib-9ecf38f085148242edd6c65875e8dd9eecfb9b75.tar nixlib-9ecf38f085148242edd6c65875e8dd9eecfb9b75.tar.gz nixlib-9ecf38f085148242edd6c65875e8dd9eecfb9b75.tar.bz2 nixlib-9ecf38f085148242edd6c65875e8dd9eecfb9b75.tar.lz nixlib-9ecf38f085148242edd6c65875e8dd9eecfb9b75.tar.xz nixlib-9ecf38f085148242edd6c65875e8dd9eecfb9b75.tar.zst nixlib-9ecf38f085148242edd6c65875e8dd9eecfb9b75.zip |
Merge pull request #270521 from uninsane/pr-ripgrep-cross-14-0-1
ripgrep: fix cross compilation
-rw-r--r-- | pkgs/tools/text/ripgrep/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 3b34058a74ac..5c8427679c82 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, buildPackages , fetchFromGitHub , rustPlatform , installShellFiles @@ -6,6 +7,7 @@ , Security , withPCRE2 ? true , pcre2 +, enableManpages ? stdenv.hostPlatform.emulatorAvailable buildPackages }: rustPlatform.buildRustPackage rec { @@ -28,10 +30,10 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional withPCRE2 "pcre2"; - preFixup = '' - $out/bin/rg --generate man > rg.1 + preFixup = lib.optionalString enableManpages '' + ${stdenv.hostPlatform.emulator buildPackages} $out/bin/rg --generate man > rg.1 installManPage rg.1 - + '' + '' installShellCompletion --cmd rg \ --bash <($out/bin/rg --generate complete-bash) \ --fish <($out/bin/rg --generate complete-fish) \ |