From 689f7f0061f7339ee7470bbcc3c41f4cf2a633b9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 3 Feb 2024 16:15:24 +0000 Subject: [PATCH] cie-middleware-linux: pull upstream `gcc-13` build fix Without the change build against `gcc-13` fails as https://hydra.nixos.org/build/247556526: ../pkcs11/src/LOGGER/Logger.h:74:15: error: 'uint8_t' has not been declared 74 | void buffer(uint8_t* buff, size_t buff_size) throw(); | ^~~~~~~ --- pkgs/tools/security/cie-middleware-linux/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/security/cie-middleware-linux/default.nix b/pkgs/tools/security/cie-middleware-linux/default.nix index fa5ec2d2af83..9982da5ae896 100644 --- a/pkgs/tools/security/cie-middleware-linux/default.nix +++ b/pkgs/tools/security/cie-middleware-linux/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , makeWrapper , strip-nondeterminism , meson @@ -92,6 +93,15 @@ stdenv.mkDerivation { libxml2 ]; + patches = [ + # Fix gcc-13 build by adding missing include. + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/M0Rf30/cie-middleware-linux/commit/1da1196152f7a3bbe92ba3ce993ebb6785ff049e.patch"; + hash = "sha256-aM23A1ZX8kebgX6RXVS78SEa+to93glUmIYO+lfUzfg="; + }) + ]; + postPatch = '' # substitute the cieid command with this $out/bin/cieid substituteInPlace libs/pkcs11/src/CSP/AbilitaCIE.cpp \