From 1e31ea1b44a1f54d79e5a6ced74a24dbb6503410 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 23 Nov 2021 22:30:19 +0000 Subject: [PATCH] bviplus: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: creadline.c:71:3: error: format not a string literal and no format arguments [-Werror=format-security] 71 | mvwprintw(w, y, x, prompt); | ^~~~~~~~~ --- pkgs/applications/editors/bviplus/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index e48a147e6daf..22d15d54f193 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses }: stdenv.mkDerivation rec { pname = "bviplus"; @@ -9,6 +9,18 @@ stdenv.mkDerivation rec { sha256 = "08q2fdyiirabbsp5qpn3v8jxp4gd85l776w6gqvrbjwqa29a8arg"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://sourceforge.net/p/bviplus/bugs/7/ + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://sourceforge.net/p/bviplus/bugs/7/attachment/bviplus-ncurses-6.2.patch"; + sha256 = "1g3s2fdly3qliy67f3dlb12a03a21zkjbya6gap4mqxhyyjbp46x"; + # svn patch, rely on prefix added by fetchpatch: + extraPrefix = ""; + }) + ]; + buildInputs = [ ncurses ];