From d60e0155dbf26dc8cbd0bde85222eb6f70344a76 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 3 Jun 2026 01:04:03 +0200 Subject: [PATCH] renderdoc: pcre -> pcre2 Thanks ShyAssasin for discovering these patches --- pkgs/by-name/re/renderdoc/package.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix index ecd48c048c60..56f1d346026e 100644 --- a/pkgs/by-name/re/renderdoc/package.nix +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -12,7 +12,7 @@ libpthread-stubs, makeWrapper, nix-update-script, - pcre, + pcre2, pkg-config, python312Packages, qt5, @@ -61,6 +61,24 @@ stdenv.mkDerivation (finalAttrs: { revert = true; }) ]; + swig_patches = [ + # use PCRE2 instead of PCRE + (fetchpatch { + name = "renderdoc-swig-pcre2-1.patch"; + url = "https://src.fedoraproject.org/rpms/renderdoc/raw/19ce666d120a229e5c1ab62fc142610ab3b21b3c/f/renderdoc-swig-pcre2-1.patch"; + hash = "sha256-xuqHu72vAbxFELNTfJT5SbQOsnG/ee++MZgpuEGLT/w="; + }) + (fetchpatch { + name = "renderdoc-swig-pcre2-2.patch"; + url = "https://src.fedoraproject.org/rpms/renderdoc/raw/19ce666d120a229e5c1ab62fc142610ab3b21b3c/f/renderdoc-swig-pcre2-2.patch"; + hash = "sha256-LUm5Ekmccy4x+hR+iK49zJc75VxuhDhpNw8rkVnn4rc="; + }) + ]; + postPatch = '' + pushd ../swig + prePatch="" postPatch="" patches="$swig_patches" runPhase patchPhase + popd + ''; buildInputs = [ libxdmcp @@ -83,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { bison cmake makeWrapper - pcre + pcre2 pkg-config python312Packages.python qt5.qtx11extras