From 5933da24d2d0ea63c1dccbb70a34756045a1ad0d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 16 Nov 2021 08:39:54 +0000 Subject: mp3blaster: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: nmixer.cc:219:26: error: format not a string literal and no format arguments [-Werror=format-security] 219 | mvwprintw(mixwin, my_y - 1, my_x, (char*)source); | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- pkgs/applications/audio/mp3blaster/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/audio/mp3blaster') diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index d7dd5f102dbd8..0d65fe813ec19 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libvorbis, SDL }: stdenv.mkDerivation rec { pname = "mp3blaster"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/stragulus/mp3blaster/pull/8 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/stragulus/mp3blaster/commit/62168cba5eaba6ffe56943552837cf033cfa96ed.patch"; + sha256 = "088l27kl1l58lwxfnw5x2n64sdjy925ycphni3icwag7zvpj0xz1"; + }) + ]; + buildInputs = [ ncurses libvorbis -- cgit 1.4.1