mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
Merge pull request #283814 from trofi/localproxy-gcc-13-fix
localproxy: fix `gcc-13` build failure
This commit is contained in:
commit
94a0ddbbff
@ -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 ];
|
||||
|
Loading…
Reference in New Issue
Block a user