From f438857c8e6af938651ba9bf115f13413cae80b9 Mon Sep 17 00:00:00 2001 From: Xyven Date: Tue, 3 Feb 2026 16:32:23 -0700 Subject: [PATCH] pipr: fix gcc15 build Add oniguruma as a build input for the Rust package as vendored version fails to compile. --- pkgs/by-name/pi/pipr/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pi/pipr/package.nix b/pkgs/by-name/pi/pipr/package.nix index 20b38d4ea515..02c3b9892e3a 100644 --- a/pkgs/by-name/pi/pipr/package.nix +++ b/pkgs/by-name/pi/pipr/package.nix @@ -3,6 +3,8 @@ fetchFromGitHub, rustPlatform, bubblewrap, + oniguruma, + pkg-config, makeWrapper, }: @@ -19,7 +21,15 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-SRIv/dZcyKm2E7c5/LtMCDnh+SDqPhJ01GZtkj0RgA0="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + buildInputs = [ oniguruma ]; + + # use system oniguruma since the bundled one fails to build with gcc15 + env.RUSTONIG_SYSTEM_LIBONIG = 1; + postFixup = '' wrapProgram "$out/bin/pipr" --prefix PATH : ${lib.makeBinPath [ bubblewrap ]} '';