From 47ff4c7e81d1521a6d47f73174f2369bdfb7be34 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 20 Aug 2023 10:10:24 +0100 Subject: [PATCH] limesuite: pull gcc-13 fix pending upstream inclusion Without the change build against `gcc-13` fails as: $ nix build --impure --expr 'with import ./. {}; limesuite.override {stdenv = gcc13Stdenv; }' -L ... /build/source/src/lms7002m_mcu/MCU_File.cpp:340:21: error: 'uint8_t' was not declared in this scope 340 | uint8_t i = 0; | ^~~~~~~ /build/source/src/lms7002m_mcu/MCU_File.cpp:4:1: note: 'uint8_t' is defined in header ''; did you forget to '#include '? 3 | #include +++ |+#include --- pkgs/applications/radio/limesuite/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index c057fe62f1c6..a08293c8ef73 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake +, fetchpatch , sqlite, wxGTK32, libusb1, soapysdr , mesa_glu, libX11, gnuplot, fltk , GLUT @@ -16,6 +17,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-t3v2lhPZ1L/HRRBwA3k1KfIpih6R4TUmBWaIm8sVGdY="; }; + patches = [ + # Pull gcc-13 fix pending upstream inclusion: + # https://github.com/myriadrf/LimeSuite/pull/384 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/myriadrf/LimeSuite/commit/4ab51835d0fde4ffe6b7be2ac3dfa915e7d4d26e.patch"; + hash = "sha256-53nLeluMtTPXxchbpftPE8Z1QMyi0UKp+0nRF4ufUgo="; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [