BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ebusd: pull gcc-13 fix

Browse source 
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 |
This commit is contained in:
Sergei Trofimovich 2024-01-05 10:22:59 +00:00
parent 340cf4304d
commit fff2419420
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/servers/ebusd/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
pname = "ebusd"; pname = "ebusd";
@ -27,6 +27,12 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./patches/ebusd-cmake.patch ./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 = [ cmakeFlags = [