From e699a0ade267e2c6308f29a30692662dcf27a291 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 17 Nov 2021 09:15:06 +0000 Subject: [PATCH] musikcube: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: musikcube/cursespp/cursespp/curses_config.h:54:36: error: format not a string literal and no format arguments [-Werror=format-security] 54 | if (window && format) { wprintw(window, format, ##__VA_ARGS__); } | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ musikcube/src/musikcube/app/window/TransportWindow.cpp:640:5: note: in expansion of macro 'checked_wprintw' 640 | checked_wprintw(c, shuffleLabel.c_str( --- pkgs/applications/audio/musikcube/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 2824832ef604..8e9e269abc97 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -4,6 +4,7 @@ , boost , curl , fetchFromGitHub +, fetchpatch , ffmpeg , lame , libev @@ -26,6 +27,16 @@ stdenv.mkDerivation rec { sha256 = "1y00vwn1h10cfflxrm5bk271ak9gilhjycgi44hlkkhmf5bdgn35"; }; + patches = [ + # Fix pending upstream inclusion for ncuurses-6.3 support: + # https://github.com/clangen/musikcube/pull/474 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/clangen/musikcube/commit/1240720e27232fdb199a4da93ca6705864442026.patch"; + sha256 = "0bhjgwnj6d24wb1m9xz1vi1k9xk27arba1absjbcimggn54pinid"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config