From ec713fe238f1d3b31089f1668d849cf6c0502bfc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 22 Nov 2021 10:01:09 +0000 Subject: [PATCH] burp: pull upstream fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: src/client/monitor/status_client_ncurses.c:350:9: error: format not a string literal and no format arguments [-Werror=format-security] 350 | mvprintw(0, col-l-1, date); | ^~~~~~~~ --- pkgs/tools/backup/burp/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 00b2c71037a8..187fe71896d6 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config , acl, librsync, ncurses, openssl, zlib, uthash }: stdenv.mkDerivation rec { @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { sha256 = "1zhq240kz881vs2s620qp0kifmgr582caalm85ls789w9rmdkhjl"; }; + patches = [ + # Pull upstream fix for ncurses-6.3 support + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/grke/burp/commit/1d6c931af7c11f164cf7ad3479781e8f03413496.patch"; + sha256 = "14sfbfahlankz3xg6v10i8fnmpnmqpp73q9xm0l0hnjh25igv6bl"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ librsync ncurses openssl zlib uthash ] ++ lib.optional (!stdenv.isDarwin) acl;