From 55e4f1fea4c38928bef9db71b12010c5e6ecad38 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 20 Aug 2023 12:34:54 +0100 Subject: [PATCH] cm256cc: pull fix pending upstream inclusion for gcc-13 Without the change build fails on `gcc-13` as: $ nix build --impure --expr 'with import ./. {}; cm256cc.override { stdenv = gcc13Stdenv; }' -L ... /build/source/unit_test/data.h:37:9: error: 'uint16_t' does not name a type 37 | uint16_t i; | ^~~~~~~~ /build/source/unit_test/data.h:33:1: note: 'uint16_t' is defined in header ''; this is probably fixable by adding '#include ' 32 | #include +++ |+#include --- pkgs/development/libraries/cm256cc/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/development/libraries/cm256cc/default.nix index 4b49bcbbcc99..0e8b03aa7236 100644 --- a/pkgs/development/libraries/cm256cc/default.nix +++ b/pkgs/development/libraries/cm256cc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost } : +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost } : stdenv.mkDerivation rec { pname = "cm256cc"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-T7ZUVVYGdzAialse//MoqWCVNBpbZvzWMAKc0cw7O9k="; }; + patches = [ + # Pull fix pending upstream inclusion for gcc-13 support: + # https://github.com/f4exb/cm256cc/pull/18 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/f4exb/cm256cc/commit/a7f142bcdae8be1c646d67176ba0ba0f7e8dcd68.patch"; + hash = "sha256-J7bm44sqnGsdPhJxQrE8LDxZ6tkTzLslHQnnKmtgrtM="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost ];