Merge pull request #120234 from cmm/antlr3-c++20

antlr3: make C++ includes compatible with C++20
This commit is contained in:
Sandro 2021-04-24 02:56:41 +02:00 committed by GitHub
commit 965d590fc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, fetchFromGitHub, jre}: {lib, stdenv, fetchpatch, fetchurl, fetchFromGitHub, jre}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "antlr"; pname = "antlr";
@ -14,6 +14,13 @@ stdenv.mkDerivation rec {
sha256 = "1i0w2v9prrmczlwkfijfp4zfqfgrss90a7yk2hg3y0gkg2s4abbk"; 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 = '' installPhase = ''
mkdir -p "$out"/{lib/antlr,bin,include} mkdir -p "$out"/{lib/antlr,bin,include}
cp "$jar" "$out/lib/antlr/antlr-${version}-complete.jar" cp "$jar" "$out/lib/antlr/antlr-${version}-complete.jar"