From 473ac28b806b1e9c11cc71f6c388a1ccd3bcf961 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 18 Nov 2021 10:32:52 +0000 Subject: [PATCH] pacvim: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: src/helperFns.cpp:103:17: error: format not a string literal and no format arguments [-Werror=format-security] 103 | mvprintw(TOP+5, 0, (x).c_str()); | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~ --- pkgs/games/pacvim/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix index dc2c216b1bf..a4347550c1d 100644 --- a/pkgs/games/pacvim/default.nix +++ b/pkgs/games/pacvim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses }: stdenv.mkDerivation { pname = "pacvim"; @@ -9,6 +9,15 @@ stdenv.mkDerivation { rev = "ca7c8833c22c5fe97974ba5247ef1fcc00cedb8e"; sha256 = "1kq6j7xmsl5qfl1246lyglkb2rs9mnb2rhsdrp18965dpbj2mhx2"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/jmoon018/PacVim/pull/53 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/jmoon018/PacVim/commit/760682824cdbb328af616ff43bf822ade23924f7.patch"; + sha256 = "1y3928dc2nkfldqhpiqk0blbx7qj8ar35f1w7fb92qwxrj8p4i6g"; + }) + ]; buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ];