From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkOP-0008W4-F9 for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gGkOK-0004Zl-Er for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:09 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42540) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gGkOK-0004ZV-Ai for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gGkOK-0007Nh-7x for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:04 -0400 Subject: [bug#33186] [PATCH 6/7] gnu: slang: Use a correct location for terminfo dirs. Resent-Message-ID: From: Mathieu Othacehe Date: Sun, 28 Oct 2018 21:40:42 +0900 Message-Id: <20181028124043.21773-7-m.othacehe@gmail.com> In-Reply-To: <20181028124043.21773-2-m.othacehe@gmail.com> References: <20181028124043.21773-2-m.othacehe@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33186@debbugs.gnu.org As termcap is disabled and no terminfo directory is given, slang is not able to query terminal capabilities. Specifying a correct path for terminfo will automatically disable termcap support in the configuration. * gnu/packages/slang.scm (slang)[source]: Remove the snippet disabling termcap. [arguments]: Set MISC_TERMINFO_DIRS to a correct location. --- gnu/packages/slang.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/slang.scm b/gnu/packages/slang.scm index 24eb5fa13..185d44191 100644 --- a/gnu/packages/slang.scm +++ b/gnu/packages/slang.scm @@ -50,13 +50,21 @@ '(begin (substitute* "src/Makefile.in" (("/bin/ln") "ln")) - (substitute* "configure" - (("-ltermcap") "")) #t)))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f - #:parallel-build? #f)) ; there's at least one race + #:parallel-build? #f ; there's at least one race + #:phases + (modify-phases %standard-phases + (add-before 'configure 'substitute-before-config + (lambda* (#:key inputs #:allow-other-keys) + (let ((ncurses (assoc-ref inputs "ncurses"))) + (substitute* "configure" + (("MISC_TERMINFO_DIRS=\"\"") + (string-append "MISC_TERMINFO_DIRS=" + "\"" ncurses "/share/terminfo" "\""))) + #t)))))) (inputs `(("readline" ,readline) ("zlib" ,zlib) -- 2.17.1