From be6e6d2e0481a819648e1caf970c152822aebd20 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 20 Feb 2018 14:30:20 -0600 Subject: [PATCH] ncurses 6.1: fix URL, accomodate captoinfo/infotocap along with tic --- pkgs/development/libraries/ncurses/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 9ccdb48916a..1524b265999 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat"; src = fetchurl { - url = "mirror://gnu/ncurses/${name}.tar.gz"; + url = "mirror://gnu/ncurses/ncurses-${version}.tar.gz"; sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da"; }; @@ -117,6 +117,8 @@ stdenv.mkDerivation rec { moveToOutput "bin/tic" "$out" moveToOutput "bin/tput" "$out" moveToOutput "bin/tset" "$out" + moveToOutput "bin/captoinfo" "$out" + moveToOutput "bin/infotocap" "$out" ''; preFixup = lib.optionalString (!hostPlatform.isCygwin) ''