From 77c54c908fc71cd6e60e7d3b5233b2168b3b9722 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 3 Nov 2021 08:08:44 +0000 Subject: [PATCH] bastet: fix build against upcoming ncurses-6.3 On ncurses-6.3 with extra printf() annotations gcc now detects use of user input in place of format strings: Ui.cpp:293:16: error: format not a string literal and no format arguments [-Werror=format-security] 293 | mvwprintw(w,0,0,msg.c_str()); | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~ --- pkgs/games/bastet/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix index 053eca57528b..74d83424f76b 100644 --- a/pkgs/games/bastet/default.nix +++ b/pkgs/games/bastet/default.nix @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { url = "https://github.com/fph/bastet/commit/0e03f8d4d6bc6949cf1c447e632ce0d1b98c4be1.patch"; sha256 = "1475hisbm44jirsrhdlnddppsyn83xmvcx09gfkm9drcix05alzj"; }) + + # Fix pending upstream inclusion for ncurses-6.3: + # https://github.com/fph/bastet/pull/21 + (fetchpatch { + name = "ncurses-6.3"; + url = "https://github.com/fph/bastet/commit/54a6d127351ea2c62f50efafe97c5b02e23e86a7.patch"; + sha256 = "14v95b0m16m6ycd82i3wpp81kbmj6qz029b1m5483dkk6mwz98iy"; + }) ]; installPhase = ''