diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-04-24 02:56:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-24 02:56:41 +0200 |
| commit | 965d590fc57b449dc8a6b5d3528b82b7bf46f749 (patch) | |
| tree | 3d9a98f1a1097680b42e56c149edbca05faa47b1 /pkgs | |
| parent | aec6218bf0f32025927dc1fbdc4f7b8b5f03efe3 (diff) | |
| parent | a2ae19a00dc520731187e55e28303484e62d2faa (diff) | |
Merge pull request #120234 from cmm/antlr3-c++20
antlr3: make C++ includes compatible with C++20
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/parsing/antlr/3.5.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 2efe752c3635b..cb6263aca424f 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, fetchFromGitHub, jre}: +{lib, stdenv, fetchpatch, fetchurl, fetchFromGitHub, jre}: stdenv.mkDerivation rec { pname = "antlr"; @@ -14,6 +14,13 @@ stdenv.mkDerivation rec { sha256 = "1i0w2v9prrmczlwkfijfp4zfqfgrss90a7yk2hg3y0gkg2s4abbk"; }; + patches = [ + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/antlr3/raw/f1bb8d639678047935e1761c3bf3c1c7da8d0f1d/f/0006-antlr3memory.hpp-fix-for-C-20-mode.patch"; + sha256 = "0apk904afjqbad6c7z9r72a9lkbz69vwrl8j2a6zgxjn8dfb2p8b"; + }) + ]; + installPhase = '' mkdir -p "$out"/{lib/antlr,bin,include} cp "$jar" "$out/lib/antlr/antlr-${version}-complete.jar" |