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

sgx-azure-dcap-client: fix gcc-13 build failure

Browse Source 
Without the change build fails on `master` as
https://hydra.nixos.org/build/247706272:

    local_cache.cpp: In function 'void throw_if(bool, const std::string&)':
    local_cache.cpp:40:20: error: 'runtime_error' is not a member of 'std'
       40 |         throw std::runtime_error(error);
          |                    ^~~~~~~~~~~~~
    local_cache.cpp:17:1: note: 'std::runtime_error' is defined in header '<stdexcept>'; did you forget to '#include <stdexcept>'?
       16 | #include <sys/file.h>
      +++ |+#include <stdexcept>
       17 | #include <sys/stat.h>
This commit is contained in:
Sergei Trofimovich 2024-02-10 23:02:59 +00:00
parent ef6206934d
commit 9687bedc4c
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix
View File

@ -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
];

2
pkgs/os-specific/linux/sgx/azure-dcap-client/test-suite.nix
View File

@ -9,7 +9,7 @@ sgx-azure-dcap-client.overrideAttrs (old: {
gtest
];
patches = [
patches = (old.patches or []) ++ [
./tests-missing-includes.patch
];