From 248b5c9cd57fc827e04c401c351965adfb9c260d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 25 Dec 2023 22:25:54 +0000 Subject: [PATCH] sedutil: fix build on `gcc-13` Without the change `sedutils` build fails on` staging-next` as: > ./Common/DtaOptions.h:43:9: note: 'uint8_t' is defined in header ''; did you forget to '#include '? > ./Common/DtaOptions.h:55:1: error: 'uint8_t' does not name a type > 55 | uint8_t DtaOptions(int argc, char * argv[], DTA_OPTIONS * opts); > | ^~~~~~~ The chang epulls in fix pending upstream inclusion. --- pkgs/tools/security/sedutil/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/security/sedutil/default.nix b/pkgs/tools/security/sedutil/default.nix index cb0e367fa2cc..0e83472da0e7 100644 --- a/pkgs/tools/security/sedutil/default.nix +++ b/pkgs/tools/security/sedutil/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook }: @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-NG/7aqe48ShHWW5hW8axYWV4+zX0dBE7Wy9q58l0S3E="; }; + patches = [ + # Fix for gcc-13 pending upstream inclusion: + # https://github.com/Drive-Trust-Alliance/sedutil/pull/425 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/Drive-Trust-Alliance/sedutil/commit/927cd88cad7bea94c2eebecc18f7881f0defaccb.patch"; + hash = "sha256-/Lvn3CQd7pzNhLa7sQY8VwbyJK/jEM5FzLijTQnzXx8="; + }) + ]; + postPatch = '' patchShebangs . '';