From 429e07efe5977f0d2cee0ecc2d4169e24caa3219 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 2 Nov 2021 08:49:30 +0000 Subject: [PATCH] aewan: fix build against ncurses-6.3 `ncuses-6.3` added printf-style function attributes and now makes it easier to catch cases when user input is used in palce of format string when built with CFLAGS=-Werror=format-security: aewan.c: In function 'paint_screen': aewan.c:147:7: error: format not a string literal and no format arguments [-Werror=format-security] 147 | printw(msg); | ^~~~~~ Let's pull a patch pending upstream inclusion. --- pkgs/applications/editors/aewan/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index b9d350cbd438..8472a91c596f 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, ncurses }: +{ lib, stdenv, fetchurl, fetchpatch, zlib, ncurses }: stdenv.mkDerivation rec { pname = "aewan"; @@ -9,6 +9,17 @@ stdenv.mkDerivation rec { sha256 = "5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817"; }; + patches = [ + # Pull patch pending upstream inclusion: + # https://sourceforge.net/p/aewan/bugs/13/ + (fetchpatch { + url = "https://sourceforge.net/p/aewan/bugs/13/attachment/aewan-cvs-ncurses-6.3.patch"; + sha256 = "0pgpk1l3d6d5y37lvvavipwnmv9gmpfdy21jkz6baxhlkgf43r4p"; + # patch is in CVS diff format, add 'a/' prefix + extraPrefix = ""; + }) + ]; + buildInputs = [ zlib ncurses ]; meta = {