Merge pull request #286096 from trofi/cie-middleware-linux-gcc-13-fix

cie-middleware-linux: pull upstream `gcc-13` build fix
This commit is contained in:
Nick Cao 2024-02-03 16:58:56 -05:00 committed by GitHub
commit 6cdd48b3cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -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 \