summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2021-11-13 20:48:13 +0000
committerSergei Trofimovich <slyich@gmail.com>2021-11-13 20:48:47 +0000
commit436874a70d9ea576be933ffebb39fcf41b75c5d4 (patch)
tree10201c3a06796bdec2f0e6b93eee948bfe1f6b9f
parent9e5af7b6657efb423b6110309f7a8e8796e2f411 (diff)
downloadnixpkgs-436874a70d9ea576be933ffebb39fcf41b75c5d4.tar
nixpkgs-436874a70d9ea576be933ffebb39fcf41b75c5d4.tar.gz
nixpkgs-436874a70d9ea576be933ffebb39fcf41b75c5d4.tar.bz2
nixpkgs-436874a70d9ea576be933ffebb39fcf41b75c5d4.tar.lz
nixpkgs-436874a70d9ea576be933ffebb39fcf41b75c5d4.tar.xz
nixpkgs-436874a70d9ea576be933ffebb39fcf41b75c5d4.tar.zst
nixpkgs-436874a70d9ea576be933ffebb39fcf41b75c5d4.zip
lifelines: pull pending upstream inclusion fix for ncurses-6.3
Without the fix build on ncurses-6.3 fails as:

    screen.c:430:17: error: format not a string literal and no format arguments [-Werror=format-security]
      430 |                 wprintw(win, _(qSdbrdonly));
          |                 ^~~~~~~
-rw-r--r--pkgs/applications/misc/lifelines/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/misc/lifelines/default.nix b/pkgs/applications/misc/lifelines/default.nix
index 50827355cac..f7f6c5fa2a3 100644
--- a/pkgs/applications/misc/lifelines/default.nix
+++ b/pkgs/applications/misc/lifelines/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gettext, libiconv, bison, ncurses, perl, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libiconv, bison, ncurses, perl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "lifelines";
@@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "1agszzlmkxmznpc1xj0vzxkskrcfagfjvqsdyw1yp5yg6bsq272y";
   };
 
+  patches = [
+    # Fix pending upstream inclusion for ncurses-6.3 support:
+    #  https://github.com/lifelines/lifelines/pull/437
+    (fetchpatch {
+      name = "ncurses-6.3.patch";
+      url = "https://github.com/lifelines/lifelines/commit/e04ce2794d458c440787c191877fbbc0784447bd.patch";
+      sha256 = "1smnz4z5hfjas79bfvlnpw9x8199a5g0p9cvhf17zpcnz1432kg7";
+    })
+  ];
+
   buildInputs = [
     gettext
     libiconv