diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2024-01-25 19:08:28 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2024-01-25 19:08:28 +0000 |
| commit | 33d098809be0955df03127a6d3aa09f5089d7037 (patch) | |
| tree | 427a17220525dbbb852c779cb416523eaa9ebbc1 /pkgs/applications/networking/localproxy | |
| parent | 5af80acc9abf4dac84f33ab4eebe2374f25659c8 (diff) | |
localproxy: fix `gcc-13` build failure
Without the change toe build fails on `master` as
https://hydra.nixos.org/build/246446023:
In file included from /build/source/src/ProxySettings.cpp:6:
/build/source/src/ProxySettings.h:24:17: error: 'int32_t' in namespace 'std' does not name a type
24 | extern std::int32_t const DEFAULT_TCP_CONNECTION_RETRY_COUNT;
| ^~~~~~~
Diffstat (limited to 'pkgs/applications/networking/localproxy')
| -rw-r--r-- | pkgs/applications/networking/localproxy/default.nix | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/applications/networking/localproxy/default.nix b/pkgs/applications/networking/localproxy/default.nix index 06968035f04a0..3de21a4c71127 100644 --- a/pkgs/applications/networking/localproxy/default.nix +++ b/pkgs/applications/networking/localproxy/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , openssl , protobuf_21 @@ -23,6 +24,21 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-voUKfXa43mOltePQEXgmJ2EBaN06E6R/2Zz6O09ogyY="; }; + patches = [ + # gcc-13 compatibility fix: + # https://github.com/aws-samples/aws-iot-securetunneling-localproxy/pull/136 + (fetchpatch { + name = "gcc-13-part-1.patch"; + url = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy/commit/f6ba73eaede61841534623cdb01b69d793124f4b.patch"; + hash = "sha256-sB9GuEuHLyj6DXNPuYAMibUJXdkThKbS/fxvnJU3rS4="; + }) + (fetchpatch { + name = "gcc-13-part-2.patch"; + url = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy/commit/de8779630d14e4f4969c9b171d826acfa847822b.patch"; + hash = "sha256-11k6mRvCx72+5G/5LZZx2qnx10yfKpcAZofn8t8BD3E="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ openssl protobuf catch2 boost icu ]; |