From fff241942046fe5d39fe15421e01b2d826d4386d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 5 Jan 2024 10:22:59 +0000
Subject: [PATCH] ebusd: pull `gcc-13` fix

Without the change `ebusd` fails the build in `staging-next` as
https://hydra.nixos.org/build/245419852:

    In file included from /build/source/src/lib/ebus/device.h:24,
                     from /build/source/src/lib/ebus/device.cpp:23:
    /build/source/src/lib/ebus/transport.h:139:32: error: 'uint8_t' does not name a type
      139 |   virtual result_t write(const uint8_t* data, size_t len) = 0;  // abstract
          |                                ^~~~~~~
    /build/source/src/lib/ebus/transport.h:27:1: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
       26 | #include "lib/ebus/symbol.h"
      +++ |+#include <cstdint>
       27 |
---
 pkgs/servers/ebusd/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/ebusd/default.nix b/pkgs/servers/ebusd/default.nix
index 3e0b24c42c86..bc20b930aef0 100644
--- a/pkgs/servers/ebusd/default.nix
+++ b/pkgs/servers/ebusd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkgs, fetchFromGitHub, argparse, mosquitto, cmake, autoconf, automake, libtool, pkg-config, openssl }:
+{ lib, stdenv, pkgs, fetchFromGitHub, fetchpatch, argparse, mosquitto, cmake, autoconf, automake, libtool, pkg-config, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "ebusd";
@@ -27,6 +27,12 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./patches/ebusd-cmake.patch
+    # Upstream patch for gcc-13 copmpatibility:
+    (fetchpatch {
+      name = "gcc-13.patch";
+      url = "https://github.com/john30/ebusd/commit/3384f3780087bd6b94d46bf18cdad18201ad516c.patch";
+      hash = "sha256-+wZDHjGaIhBCqhy2zmIE8Ko3uAiw8kfKx64etCqRQjM=";
+    })
   ];
 
   cmakeFlags = [