From b524bea334ed9a88850c4312481708902c7dcf42 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 19 Nov 2021 09:23:32 +0000 Subject: [PATCH] vimpc: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: src/window/listwindow.cpp:120:16: error: format not a string literal and no format arguments [-Werror=format-security] 120 | mvwprintw(window, line, 0, BlankLine.c_str()); | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- pkgs/applications/audio/vimpc/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index a576898128ec..5cc3c1099995 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , libmpdclient , ncurses @@ -21,6 +22,16 @@ stdenv.mkDerivation rec { sha256 = "0lswzkap2nm7v5h7ppb6a64cb35rajysd09nb204rxgrkij4m6nx"; }; + patches = [ + # Pull fix pending upstream inclusion for ncurses-6.3: + # https://github.com/boysetsfrog/vimpc/pull/100 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/boysetsfrog/vimpc/commit/055ecdce0720fdfc9ec2528c520b6c33da36271b.patch"; + sha256 = "01p858jjxm0bf8hnk1z8h45j8c1y9i995mafa6ff3vg9vlak61pv"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libmpdclient ncurses pcre taglib curl ];