diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-04-24 07:20:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-24 07:20:45 +0200 |
| commit | 3a6dd829891d8e6c56ad616be92e7a9fd1030ef1 (patch) | |
| tree | 54675dfc032f42894ea776a999cb55f8f19e5aa4 /pkgs/development | |
| parent | 496d33dc179f5e0032d5fe61f3961ce57621a62b (diff) | |
| parent | b71a8621a2a6966ed86871c9102ed18acbc45346 (diff) | |
Merge pull request #120235 from cmm/rapidjson-c++20
rapidjson: make compatible with C++20
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/rapidjson/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index 52a0877e77f34..1211892890add 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, cmake }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake }: stdenv.mkDerivation rec { pname = "rapidjson"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; }; + patches = [ + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/rapidjson/raw/48402da9f19d060ffcd40bf2b2e6987212c58b0c/f/rapidjson-1.1.0-c++20.patch"; + sha256 = "1qm62iad1xfsixv1li7qy475xc7gc04hmi2q21qdk6l69gk7mf82"; + }) + ]; + nativeBuildInputs = [ pkg-config cmake ]; preConfigure = '' |