From patchwork Fri Dec 3 20:21:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jgart X-Patchwork-Id: 34947 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 5AB9027BBEA; Fri, 3 Dec 2021 20:24:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 153C027BBE9 for ; Fri, 3 Dec 2021 20:24:11 +0000 (GMT) Received: from localhost ([::1]:51762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mtF6I-0007WN-1K for patchwork@mira.cbaines.net; Fri, 03 Dec 2021 15:24:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mtF6A-0007WF-J5 for guix-patches@gnu.org; Fri, 03 Dec 2021 15:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mtF6A-0000mz-Bl for guix-patches@gnu.org; Fri, 03 Dec 2021 15:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mtF6A-0002K4-5t for guix-patches@gnu.org; Fri, 03 Dec 2021 15:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51627] [PATCH v2] gnu: st: Install terminfo files. References: <20211106085334.4778-1-jgart@dismail.de> In-Reply-To: <20211106085334.4778-1-jgart@dismail.de> Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Dec 2021 20:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51627 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51627@debbugs.gnu.org Cc: jgart Received: via spool by 51627-submit@debbugs.gnu.org id=B51627.16385630148894 (code B ref 51627); Fri, 03 Dec 2021 20:24:02 +0000 Received: (at 51627) by debbugs.gnu.org; 3 Dec 2021 20:23:34 +0000 Received: from localhost ([127.0.0.1]:52298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mtF5a-0002JG-TS for submit@debbugs.gnu.org; Fri, 03 Dec 2021 15:23:34 -0500 Received: from mx1.dismail.de ([78.46.223.134]:40568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mtF5W-0002Iy-2p for 51627@debbugs.gnu.org; Fri, 03 Dec 2021 15:23:26 -0500 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 0fb881e1 for <51627@debbugs.gnu.org>; Fri, 3 Dec 2021 21:23:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=20190914; bh=QINeb+F+1qdnKNgMUPip9YxDyp5/JS0XgNkfSnSLgnM=; b= AKYJqSbXFqKXJ6+7gJ/ZGObGHbCONasSGi6JiZ2T9VJJiauv7uBnSFwILOQVwQmJ QQYAYTACwR1bA+wF4EiqrKgigeMMdz9mhWaTDRtVE/6X24wuq0cZLCZg69u5M1z+ 4bFFiQ7O6aupa23G5ftnDT1WVDVyRFEU9lA2xvhr3UaP+Xv8RUpN41jefqi2jjtu rXCKn0+CpBVSN0/Cyf/FsxwKLgSJ9k5qOpCOg402bYtjoxkPAX2MUY9spRD7ohn4 nA9g5d+pM0lgLw52ELSGRiN4XBsP1f2+3PACAMzSjxW2kja9apxxqpaLGKs+uEkf I+bPLp4u618XJrS23MS2MQ== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 0b339c3a for <51627@debbugs.gnu.org>; Fri, 3 Dec 2021 21:23:14 +0100 (CET) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id 6e7240c7 for <51627@debbugs.gnu.org>; Fri, 3 Dec 2021 21:23:14 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id af0519d8 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Fri, 3 Dec 2021 21:23:09 +0100 (CET) Date: Fri, 3 Dec 2021 15:21:34 -0500 Message-Id: <20211203202133.12732-1-jgart@dismail.de> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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" Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches X-Patchwork-Original-From: jgart via Guix-patches via From: jgart X-getmail-retrieved-from-mailbox: Patches Here is version two of the patch set that adds ncurses to the native-input. The Makefile already takes care of compiling the terminfo files as long as the tic binary is available. The tic binary comes from the ncurse package. * gnu/packages/suckless.scm (st)[native-inputs]: Add ncurses. [configure-flags](TERMINFO): New flag. [phases](inhibit-terminfo-install): Remove phase. --- gnu/packages/suckless.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index b4855ec0a2..fcebe894a7 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -378,22 +378,15 @@ (define-public st `(#:tests? #f ; no tests #:make-flags (list (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'inhibit-terminfo-install - (lambda _ - (substitute* "Makefile" - (("\ttic .*") "")) - #t))))) + (string-append "PREFIX=" %output)))) (inputs `(("libx11" ,libx11) ("libxft" ,libxft) ("fontconfig" ,fontconfig) ("freetype" ,freetype))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("ncurses" ,ncurses) + ("pkg-config" ,pkg-config))) (home-page "https://st.suckless.org/") (synopsis "Simple terminal emulator") (description