From 9771113f7c390fa56a5437b318417b27290c13d8 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sat, 13 Jan 2024 09:56:48 +0000 Subject: [PATCH] radiotray-ng: fix gcc13 errors with upstream patch --- pkgs/applications/audio/radiotray-ng/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 63e2bd7f2dcc..ce3f57162366 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , cmake, pkg-config # Transport , curl @@ -65,7 +65,14 @@ stdenv.mkDerivation rec { ] ++ gstInputs ++ pythonInputs; - patches = [ ./no-dl-googletest.patch ]; + patches = [ + ./no-dl-googletest.patch + (fetchpatch { + name = "gcc13-fixes.patch"; + url = "https://github.com/ebruck/radiotray-ng/commit/7a99bfa784f77be8f160961d25ab63dc2d5ccde0.patch"; + hash = "sha256-7x3v0dp9WPgd/vsnxezgXIZGsBrIHkTwIiu+FMlLmyA="; + }) + ]; postPatch = '' for x in package/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do