From patchwork Sat Nov 6 08:53:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jgart X-Patchwork-Id: 34272 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 15B7027BBE3; Sat, 6 Nov 2021 08:57:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D7AD927BBE1 for ; Sat, 6 Nov 2021 08:57:44 +0000 (GMT) Received: from localhost ([::1]:39046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mjHWC-0000zH-3S for patchwork@mira.cbaines.net; Sat, 06 Nov 2021 04:57:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjHTa-0008Ev-R8 for guix-patches@gnu.org; Sat, 06 Nov 2021 04:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36802) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mjHTa-0003Wl-6Z for guix-patches@gnu.org; Sat, 06 Nov 2021 04:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mjHTa-0003Z4-5H for guix-patches@gnu.org; Sat, 06 Nov 2021 04:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51627] [PATCH] gnu: st: Compile and install terminfo files. Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Nov 2021 08:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51627 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51627@debbugs.gnu.org Cc: jgart X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163618886013634 (code B ref -1); Sat, 06 Nov 2021 08:55:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Nov 2021 08:54:20 +0000 Received: from localhost ([127.0.0.1]:48343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mjHSt-0003Xq-OX for submit@debbugs.gnu.org; Sat, 06 Nov 2021 04:54:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:38812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mjHSr-0003Xd-TJ for submit@debbugs.gnu.org; Sat, 06 Nov 2021 04:54:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjHSr-0007wR-Lx for guix-patches@gnu.org; Sat, 06 Nov 2021 04:54:17 -0400 Received: from mx1.dismail.de ([78.46.223.134]:35283) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjHSq-0003SA-0B for guix-patches@gnu.org; Sat, 06 Nov 2021 04:54:17 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id f2f644fe for ; Sat, 6 Nov 2021 09:54: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=MhBxJLHUQ6oqoUAsHrxOHKh5ji7NeNu4Z2CrZUFVxI8=; b= ntJ1pNVBxZBayyxWAS24mV7VqU34Sy6KqUd7ke82mq3DbFzHbJcj/0Tt63f2WX4O XlnwPwj1I4kFnP1IxD9HhXLthJ76Q7MKeTnbC8x/ka50ZeSWY/lTwgjNKWdrc3d9 oevwpYr9pz1BiGuwM3zYMG5KuV9UmcnElhAKrSTtC2YUCF2iJpOY+TVO0Z5t3pjX RHyJ+OrsRJLKE14lNXu4zH5fesmgDSQrZ9kM8BI2qysJJ/zAPWdQ9VVaN1q7ScJd yiMyu67qvOLSahhqiZ27rn5EihpSHtWYfYdJDCkCdMG9zN/wpLxs7KodBjSZDqGo sDd1M1bK3ylUjglCNBaWTw== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 4deea51b for ; Sat, 6 Nov 2021 09:54:14 +0100 (CET) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 57f42ab4 for ; Sat, 6 Nov 2021 09:54:14 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 897a9cb8 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Sat, 6 Nov 2021 09:54:13 +0100 (CET) Date: Sat, 6 Nov 2021 04:53:34 -0400 Message-Id: <20211106085334.4778-1-jgart@dismail.de> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Received-SPF: pass client-ip=78.46.223.134; envelope-from=jgart@dismail.de; helo=mx1.dismail.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 * gnu/packages/suckless.scm (st): Compile and install terminfo files. [native-inputs]: ncurses's tic program is required to compile the terminfo files. --- gnu/packages/suckless.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index b4855ec0a2..912ff12422 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -378,6 +378,9 @@ (define-public st `(#:tests? #f ; no tests #:make-flags (list (string-append "CC=" ,(cc-for-target)) + (string-append "TERMINFO=" + (assoc-ref %outputs "out") + "/share/terminfo") (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases @@ -385,15 +388,20 @@ (define-public st (add-after 'unpack 'inhibit-terminfo-install (lambda _ (substitute* "Makefile" - (("\ttic .*") "")) - #t))))) + (("\ttic .*") "")))) + (add-after 'install 'compile-and-install-terminfo-entry + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (terminfo (string-append out "/share/terminfo"))) + (invoke "tic" "-sx" "st.info" "-o" terminfo))))))) (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