From patchwork Sun Oct 28 12:40:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 45 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CAFCC16754; Sun, 28 Oct 2018 12:43:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 8251616750 for ; Sun, 28 Oct 2018 12:43:27 +0000 (GMT) Received: from localhost ([::1]:40019 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkPe-0002Bo-Pn for patchwork@mira.cbaines.net; Sun, 28 Oct 2018 08:43:26 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#33186] [PATCH 6/7] gnu: slang: Use a correct location for terminfo dirs. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Oct 2018 12:42:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33186@debbugs.gnu.org Received: via spool by 33186-submit@debbugs.gnu.org id=B33186.154073048128275 (code B ref 33186); Sun, 28 Oct 2018 12:42:04 +0000 Received: (at 33186) by debbugs.gnu.org; 28 Oct 2018 12:41:21 +0000 Received: from localhost ([127.0.0.1]:46791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNc-0007Lu-Sd for submit@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:21 -0400 Received: from mail-pg1-f174.google.com ([209.85.215.174]:35143) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNa-0007Kw-D7 for 33186@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:18 -0400 Received: by mail-pg1-f174.google.com with SMTP id 32-v6so2585455pgu.2 for <33186@debbugs.gnu.org>; Sun, 28 Oct 2018 05:41:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aEYXbVYwZYntcQezXe2U1ixyn/gw9YYUuarCldybdNo=; b=tdAdTuXxnrRUzoaQar2CjJN3w7JnHwWJ4lfl4/CF5zJWKneKUqHVAGX42TI4BMf/29 /MOJIrLk7SE/dwE8eraw3GED18m5MaxtncE9EViH70HDOL11kmuHhEmZZmDL/zkPTwo4 D5zMJK377TBdjpAA0gM7Wo18vMjicCOElY3mNYDJeoy6hRRXkeXoWoXhdD7DCvlsYSIp /4tegl1h2vOacXBO/5F3Qb0mkuMQpgTCoCCaEYiUjX5b5P6P2cIA/PEL5jOa5U08+f9C K3SfsbpeJVe8+6oyW4bk3m9u7y1eUYDUdnfdY6cxz6vkf6XEcMlYGi6eisDuuNlgUbq9 gMnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aEYXbVYwZYntcQezXe2U1ixyn/gw9YYUuarCldybdNo=; b=KwanTO+N+vUvHoufCsAvOIcArcv73h95ErIJdFXVaEPtewE3HtguhYvB2n2e8PIvGB 4OfqixRLKGymHwF7/xVr37XurhOfy8cuJgs9jKQ1pgYGTKvELvAExlCRydiBk7S+MdFF rsXTJFM3cOASxiSOeQtnuOcYMZjCvxwGvV6oBQ4DuDfi2Pdh6ZwscjFyPUvAutdLffPr JgMBbVxJOAVHP7RAXxEpl5wnUIRJ84hmgJX3gwEinD/rVi6cqUsuGKB0p684cGqLmxB9 XlU+FAXeHAQb5FR0fBwQuwVickIRMbv3eYMlSQc/a9mGZQLzLOGjvO+TR7zw0CB8/lEg deCw== X-Gm-Message-State: AGRZ1gLrbSUWQ1md5dk0sxbVPl5cZz187mbwbsYGZdzoDAPjIXglwHd4 DlLpj29OHAE4jTHu9HdcllOgiXZO X-Google-Smtp-Source: AJdET5dk8cuysUPfKvt7YI0xqCtBacHbdzcFR6JRjV7mwNGzePcQaZlXANEfBpAPEDgMDkepSZTZkQ== X-Received: by 2002:a63:7cf:: with SMTP id 198mr10262976pgh.129.1540730472578; Sun, 28 Oct 2018 05:41:12 -0700 (PDT) Received: from localhost.localdomain (p506075-ipngn200505niho.hiroshima.ocn.ne.jp. [180.49.233.75]) by smtp.gmail.com with ESMTPSA id c69-v6sm33201759pfg.2.2018.10.28.05.41.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 05:41:12 -0700 (PDT) From: Mathieu Othacehe Date: Sun, 28 Oct 2018 21:40:42 +0900 Message-Id: <20181028124043.21773-7-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181028124043.21773-2-m.othacehe@gmail.com> References: <20181028124043.21773-2-m.othacehe@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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)