Skip to content

Commit

Permalink
Merge pull request #179444 from SuperSandro2000/fix-gitea-commit-search
Browse files Browse the repository at this point in the history
pcre2: fix gitea websearch crashing when searching for a plain string
  • Loading branch information
SuperSandro2000 authored Jul 1, 2022
2 parents 6f47468 + 365831b commit c990bd6
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions pkgs/development/libraries/pcre2/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,20 @@
stdenv.mkDerivation rec {
pname = "pcre2";
version = "10.40";

src = fetchurl {
url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2";
hash = "sha256-FOS4PEeDkz3BfpZDGOYyT3yuG8ddjzx5vGlp8AwVnWg=";
};

# Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51
configureFlags = [
"--enable-pcre2-16"
"--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" ];

Expand All @@ -24,7 +28,7 @@ stdenv.mkDerivation rec {
'';

meta = with lib; {
homepage = "http://www.pcre.org/";
homepage = "https://www.pcre.org/";
description = "Perl Compatible Regular Expressions";
license = licenses.bsd3;
maintainers = with maintainers; [ ttuegel ];
Expand Down

0 comments on commit c990bd6

Please sign in to comment.