From 42c128c83a5b29cffaea0c3f62fe44bace2c698a Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Mon, 4 May 2026 00:23:43 -0700 Subject: [PATCH] moshi: use system oniguruma --- pkgs/by-name/mo/moshi/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/moshi/package.nix b/pkgs/by-name/mo/moshi/package.nix index 90adc5a25dbd..9b4b90df7da5 100644 --- a/pkgs/by-name/mo/moshi/package.nix +++ b/pkgs/by-name/mo/moshi/package.nix @@ -12,6 +12,7 @@ # buildInputs libopus, + oniguruma, openssl, sentencepiece, alsa-lib, @@ -74,6 +75,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ libopus + oniguruma openssl sentencepiece ] @@ -92,7 +94,11 @@ rustPlatform.buildRustPackage (finalAttrs: { lib.optionals stdenv.hostPlatform.isDarwin [ "metal" ] ++ lib.optionals config.cudaSupport [ "cuda" ]; - env = lib.optionalAttrs config.cudaSupport { + env = { + # use system oniguruma + RUSTONIG_SYSTEM_LIBONIG = true; + } + // lib.optionalAttrs config.cudaSupport { CUDA_COMPUTE_CAP = cudaCapability'; # We already list CUDA dependencies in buildInputs