Merge pull request #278912 from trofi/ebusd-gcc-13-fix

ebusd: pull `gcc-13` fix
This commit is contained in:
Nick Cao 2024-01-05 14:42:25 -05:00 committed by GitHub
commit 95f9eedf09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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 {
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 = [