pcre2: fix gitea websearch crashing when searching for a plain string
The nixos gitea module sets MemoryDenyWriteExecute=true which requires
pcre2 to be compiled with --enable-jit-sealloc otherwise it fails with
"-48".
See https://github.com/go-gitea/gitea/issues/10840 and 920838a6a4
This commit is contained in:
parent
038d9b4d2f
commit
365831bb44
|
@ -6,16 +6,20 @@
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pcre2";
|
pname = "pcre2";
|
||||||
version = "10.40";
|
version = "10.40";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2";
|
url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2";
|
||||||
hash = "sha256-FOS4PEeDkz3BfpZDGOYyT3yuG8ddjzx5vGlp8AwVnWg=";
|
hash = "sha256-FOS4PEeDkz3BfpZDGOYyT3yuG8ddjzx5vGlp8AwVnWg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--enable-pcre2-16"
|
"--enable-pcre2-16"
|
||||||
"--enable-pcre2-32"
|
"--enable-pcre2-32"
|
||||||
] ++ lib.optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto";
|
# only enable jit on supported platforms which excludes Apple Silicon, see https://github.com/zherczeg/sljit/issues/51
|
||||||
|
"--enable-jit=auto"
|
||||||
|
# fix pcre jit in systemd units that set MemoryDenyWriteExecute=true like gitea
|
||||||
|
"--enable-jit-sealloc"
|
||||||
|
];
|
||||||
|
|
||||||
outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
|
outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
|
||||||
|
|
||||||
|
@ -24,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://www.pcre.org/";
|
homepage = "https://www.pcre.org/";
|
||||||
description = "Perl Compatible Regular Expressions";
|
description = "Perl Compatible Regular Expressions";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
maintainers = with maintainers; [ ttuegel ];
|
maintainers = with maintainers; [ ttuegel ];
|
||||||
|
|
Loading…
Reference in a new issue