Merge pull request #287891 from trofi/sgx-azure-dcap-client-gcc-13-fix

sgx-azure-dcap-client: fix `gcc-13` build failure
This commit is contained in:
Nick Cao
2024-02-11 13:22:00 -05:00
committed by GitHub
2 changed files with 12 additions and 1 deletions
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
, lib
, curl
, nlohmann_json
@@ -43,6 +44,16 @@ stdenv.mkDerivation rec {
hash = "sha256-q0dI4WdA1ue4sw+QfSherh31Ldf9gnhoft66o3E9gnU=";
};
patches = [
# Fix gcc-13 build:
# https://github.com/microsoft/Azure-DCAP-Client/pull/197
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/microsoft/Azure-DCAP-Client/commit/fbcae7b3c8f1155998248cf5b5f4c1df979483f5.patch";
hash = "sha256-ezEuQql3stn58N1ZPKMlhPpUOBkDpCcENpGwFAmWtHc=";
})
];
nativeBuildInputs = [
pkg-config
];
@@ -9,7 +9,7 @@ sgx-azure-dcap-client.overrideAttrs (old: {
gtest
];
patches = [
patches = (old.patches or []) ++ [
./tests-missing-includes.patch
];