From patchwork Sat Jun 24 11:28:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 51250 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 EAD9727BBE9; Sat, 24 Jun 2023 12:29:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 5306B27BBE2 for ; Sat, 24 Jun 2023 12:29:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qD1Ry-0003kV-8T; Sat, 24 Jun 2023 07:29:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qD1Rv-0003jU-35 for guix-patches@gnu.org; Sat, 24 Jun 2023 07:29:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qD1Ru-0001qj-Qs for guix-patches@gnu.org; Sat, 24 Jun 2023 07:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qD1Ru-0002Uw-MT for guix-patches@gnu.org; Sat, 24 Jun 2023 07:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64263] [PATCH 2/3] gnu: rxvt-unicode: Use new package style. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Jun 2023 11:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64263 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64263@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 64263-submit@debbugs.gnu.org id=B64263.16876060959524 (code B ref 64263); Sat, 24 Jun 2023 11:29:02 +0000 Received: (at 64263) by debbugs.gnu.org; 24 Jun 2023 11:28:15 +0000 Received: from localhost ([127.0.0.1]:39987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD1R9-0002TX-0m for submit@debbugs.gnu.org; Sat, 24 Jun 2023 07:28:15 -0400 Received: from araneo.si ([90.157.193.204]:40348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD1R6-0002T3-Ht for 64263@debbugs.gnu.org; Sat, 24 Jun 2023 07:28:13 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id dabe352e for <64263@debbugs.gnu.org>; Sat, 24 Jun 2023 11:28:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=tt3W4ErQCuvoVMxwgOHxs bfvkVc=; b=Zv00ctxJLjJt6YmYFIbxgmTHYpU+0y9Up4I6CqYg+t0I8Yxi9KQWW hbd6geI+xrLSJfV2M+D35xI8ImVHSTZtTIedNpeUzzLjsk0XP8kR7Wke3sF9oWH7 yAP+PF2IekRujY3l+tb6cs/E2L/qU751PKMisaqMcUtoO1PRC/A9lzp0s/QINTq/ g3IaOxhCL57lKiJ2u8OuhJ7LXKyQmAnZcLlVrmwSzIgPPyIgPt8adP50JKfmoPeV uGkM0MRKYKLzcxKTAB3roxhaVXNRNolomtLhllXeNq1cZPwaSpy/5hChP+tiwjPb UhR+5PLTvudlSKJjW29/tDM+otJGW0i5A== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 7e0ab74b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 24 Jun 2023 11:28:10 +0000 (UTC) From: Timotej Lazar Date: Sat, 24 Jun 2023 13:28:04 +0200 Message-Id: <8f685b067ba64216eef42b3135bb02386e8be15a.1687605773.git.timotej.lazar@araneo.si> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xdisorg.scm (rxvt-unicode)[arguments]: Use gexps. [inputs]: Drop input labels. --- gnu/packages/xdisorg.scm | 78 ++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 43 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 78bde1c5f4..ed642e7ce6 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1284,52 +1284,44 @@ (define-public rxvt-unicode ;; This sets the destination when installing the necessary terminal ;; capability data, which are not provided by 'ncurses'. See ;; https://lists.gnu.org/archive/html/bug-ncurses/2009-10/msg00031.html - `(#:configure-flags (list "--enable-256-color") - #:make-flags (list (string-append "TERMINFO=" - (assoc-ref %outputs "out") - "/share/terminfo")) - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-desktop-urxvt - (lambda* (#:key outputs #:allow-other-keys) - (let* ((output (assoc-ref outputs "out")) - (desktop (string-append output "/share/applications"))) - (mkdir-p desktop) - (with-output-to-file - (string-append desktop "/urxvt.desktop") + (list #:configure-flags #~(list "--enable-256-color") + #:make-flags #~(list (string-append "TERMINFO=" #$output "/share/terminfo")) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-desktop-urxvt (lambda _ - (format #t - "[Desktop Entry]~@ - Name=rxvt-unicode~@ - Comment=~@ - Exec=~a/bin/urxvt~@ - TryExec=~@*~a/bin/urxvt~@ - Icon=~@ - Type=Application~%" - output)))))) - (add-after 'install 'install-desktop-urxvtc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((output (assoc-ref outputs "out")) - (desktop (string-append output "/share/applications"))) - (mkdir-p desktop) - (with-output-to-file - (string-append desktop "/urxvtc.desktop") + (let ((desktop (string-append #$output "/share/applications"))) + (mkdir-p desktop) + (with-output-to-file + (string-append desktop "/urxvt.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=rxvt-unicode~@ + Comment=~@ + Exec=~a/bin/urxvt~@ + TryExec=~@*~a/bin/urxvt~@ + Icon=~@ + Type=Application~%" + #$output)))))) + (add-after 'install 'install-desktop-urxvtc (lambda _ - (format #t - "[Desktop Entry]~@ - Name=rxvt-unicode (client)~@ - Comment=Rxvt clone with XFT and unicode support~@ - Exec=~a/bin/urxvtc~@ - TryExec=~@*~a/bin/urxvtc~@ - Icon=~@ - Type=Application~%" - output))))))))) + (let ((desktop (string-append #$output "/share/applications"))) + (mkdir-p desktop) + (with-output-to-file + (string-append desktop "/urxvtc.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=rxvt-unicode (client)~@ + Comment=Rxvt clone with XFT and unicode support~@ + Exec=~a/bin/urxvtc~@ + TryExec=~@*~a/bin/urxvtc~@ + Icon=~@ + Type=Application~%" + #$output))))))))) (inputs - `(("libptytty" ,libptytty) - ("libXft" ,libxft) - ("libX11" ,libx11) - ("libXt" ,libxt) - ("libxext" ,libxext))) + (list libptytty libxft libx11 libxt libxext)) (native-inputs (list ncurses ;trigger the installation of terminfo data perl pkg-config))