colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

localproxy: fix gcc-13 build failure

Browse Source 
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;
          |                 ^~~~~~~
This commit is contained in:
Sergei Trofimovich 2024-01-25 19:08:28 +00:00
parent 5af80acc9a
commit 33d098809b
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/networking/localproxy/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, openssl , openssl
, protobuf_21 , protobuf_21
@ -23,6 +24,21 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-voUKfXa43mOltePQEXgmJ2EBaN06E6R/2Zz6O09ogyY="; 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 ]; nativeBuildInputs = [ cmake ];
buildInputs = [ openssl protobuf catch2 boost icu ]; buildInputs = [ openssl protobuf catch2 boost icu ];