From f63ada60e443467a5aab30d6c8cc3195fd22636b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 6 Nov 2021 11:32:39 +0000 Subject: [PATCH] tasknc: fix build against upcoming ncurses-6.3 Without the change build fails as: src/keys.c:122:6: error: 'KEY_EVENT' undeclared here (not in a function); did you mean 'KEY_SLEFT'? 122 | {KEY_EVENT, "event"}, | ^~~~~~~~~ | KEY_SLEFT --- pkgs/applications/misc/tasknc/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index d24a7d3e0d1..5250581762b 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, ncurses5, taskwarrior }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, perl, ncurses5, taskwarrior }: stdenv.mkDerivation rec { version = "2020-12-17"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0jrv2k1yizfdjndbl06lmy2bb62ky2rjdk308967j31c5kqqnw56"; }; + # Pull pending upstream inclusion for ncurses-6.3: + # https://github.com/lharding/tasknc/pull/57 + patches = [ + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/lharding/tasknc/commit/f74ea0641e9bf287acf22fac9f6eeea571b01800.patch"; + sha256 = "18a90zj85sw2zfnfcv055nvi0lx3h8lcgsyabdfk94ksn78pygrv"; + }) + ]; + nativeBuildInputs = [ makeWrapper perl # For generating the man pages with pod2man