From patchwork Sat Jun 24 11:28:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 51248 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 83C2027BBEB; Sat, 24 Jun 2023 12:29:29 +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=ham 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 96EB227BBE9 for ; Sat, 24 Jun 2023 12:29:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qD1Rx-0003jx-Hq; Sat, 24 Jun 2023 07:29:05 -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 1qD1Ru-0003jM-Ly for guix-patches@gnu.org; Sat, 24 Jun 2023 07:29:02 -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-0001qb-Dj 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-0002Uo-8m for guix-patches@gnu.org; Sat, 24 Jun 2023 07:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64263] [PATCH 1/3] gnu: rxvt-unicode: Update to 9.31 [fixes CVE-2022-4170]. 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.16876060929502 (code B ref 64263); Sat, 24 Jun 2023 11:29:02 +0000 Received: (at 64263) by debbugs.gnu.org; 24 Jun 2023 11:28:12 +0000 Received: from localhost ([127.0.0.1]:39981 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD1R5-0002TB-ME for submit@debbugs.gnu.org; Sat, 24 Jun 2023 07:28:11 -0400 Received: from araneo.si ([90.157.193.204]:40348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD1R4-0002T3-3Q for 64263@debbugs.gnu.org; Sat, 24 Jun 2023 07:28:11 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 518d0763 for <64263@debbugs.gnu.org>; Sat, 24 Jun 2023 11:28:09 +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=se6VGtM7GL0Udom8ZWxFe KBqaZo=; b=K5aC2REKA3fCqtFoIyYiNEwh/LpnOKoDaks7AuPQI4Ob0VZiOiHXP 0r4pkur84GWwcQ5eOIoIbFMJKMeX/EaR4zBRL+O+l4K4mToLQ0QGyjAZ3qkvHGOE BJOmrTZmhswmQkT4DF97e/sXIErM9TKnQdncKKn16p++pZ6mfqFpx1OKS30xQgG3 TzPhkBJijK+7b05+JOV1VnXstMrwzKWWCaz5fZuLvSBKYC2Bv2eZ2h4xQfkE4Sho Pxh+CxTOCqZ7qAGZ10QwMT0UWevBocQ3zwpUXGregsueCXTxt7tW2PFyT3zkdEL3 w3s+WhkRuZFDK2zkEXzpCEw9cBolcdL3Q== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 5b48c4b8 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 24 Jun 2023 11:28:09 +0000 (UTC) From: Timotej Lazar Date: Sat, 24 Jun 2023 13:28:03 +0200 Message-Id: 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): Update to 9.31. [inputs]: Add libxext. --- gnu/packages/xdisorg.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index cdd5a48259..78bde1c5f4 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1271,14 +1271,14 @@ (define-public sxhkd (define-public rxvt-unicode (package (name "rxvt-unicode") - (version "9.30") + (version "9.31") (source (origin (method url-fetch) (uri (string-append "http://dist.schmorp.de/rxvt-unicode/Attic/" name "-" version ".tar.bz2")) (sha256 (base32 - "0badnkjsn3zps24r5iggj8k5v4f00npc77wqg92pcn1q5z8r677y")))) + "1s3jcvac40zzp03fvmhjsdpsjx0gb1wk54qz74zhzzj9q75kz8da")))) (build-system gnu-build-system) (arguments ;; This sets the destination when installing the necessary terminal @@ -1328,7 +1328,8 @@ (define-public rxvt-unicode `(("libptytty" ,libptytty) ("libXft" ,libxft) ("libX11" ,libx11) - ("libXt" ,libxt))) + ("libXt" ,libxt) + ("libxext" ,libxext))) (native-inputs (list ncurses ;trigger the installation of terminfo data perl pkg-config)) 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)) From patchwork Sat Jun 24 11:28:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 51249 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 76FC027BBE9; Sat, 24 Jun 2023 12:29:30 +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 8F84227BBE2 for ; Sat, 24 Jun 2023 12:29:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qD1Ry-0003kU-83; 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 1qD1Rw-0003jf-7s 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 1qD1Rv-0001qo-D1 for guix-patches@gnu.org; Sat, 24 Jun 2023 07:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qD1Rv-0002V3-4J for guix-patches@gnu.org; Sat, 24 Jun 2023 07:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64263] [PATCH 3/3] gnu: rxvt-unicode: Use helper procedure to make desktop files. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Jun 2023 11:29:03 +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.16876060989534 (code B ref 64263); Sat, 24 Jun 2023 11:29:03 +0000 Received: (at 64263) by debbugs.gnu.org; 24 Jun 2023 11:28:18 +0000 Received: from localhost ([127.0.0.1]:39989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD1R9-0002TZ-E4 for submit@debbugs.gnu.org; Sat, 24 Jun 2023 07:28:18 -0400 Received: from araneo.si ([90.157.193.204]:40348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD1R7-0002T3-C9 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 cb2392e4 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=7qM8RArWnj3fSUUROzMhm IjX0JQ=; b=NMkFdwkkNw7b8nPIU6YTqi6Yh0YuCNa53IUrRF/+JUWPMF2KgARAg +ThPZsr3cbMN+p1EgAg2sIk3+flytqpw3MeoAjRhEIl8EpYW/iT4HSaReJIPOQf7 sJnqVYu6YQWOuq0HugMwND1vgY7lcQFpAZf9IGZQyPMqXTgtys41IOJ3H4wTvK9c 99+16hQAyG3MGQykuS3fGf3ZKDgGiX3iPFm6fPU6IOmX0zucbnBB+zdtXvTjpeg/ ck15aVq0zN8mTi9ZT2W7k7aIFVk0A1T105tMw9oeR9PI0yru30Y82VrBUYXJp0KX XjvIm70xGlNTf1LazKoiPAZn1XvlZ+TMA== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 5e0067fa (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 24 Jun 2023 11:28:11 +0000 (UTC) From: Timotej Lazar Date: Sat, 24 Jun 2023 13:28:05 +0200 Message-Id: <4ae100ed7e800464e08931e89cd7fdd41b450b66.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]: Replace custom code with make-desktop-entry-file. Specify categories and icon in desktop files. --- gnu/packages/xdisorg.scm | 45 +++++++++++++--------------------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ed642e7ce6..2e31d49b0a 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1288,38 +1288,21 @@ (define-public rxvt-unicode #:make-flags #~(list (string-append "TERMINFO=" #$output "/share/terminfo")) #:phases #~(modify-phases %standard-phases - (add-after 'install 'install-desktop-urxvt + (add-after 'install 'install-desktop-entries (lambda _ - (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 _ - (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))))))))) + (for-each (lambda (exec name) + (make-desktop-entry-file + (string-append #$output "/share/applications/" + exec ".desktop") + #:type "Application" + #:name name + #:comment '((#f #$(package-synopsis this-package))) + #:exec exec + #:try-exec exec + #:icon "utilities-terminal" + #:categories '("System" "TerminalEmulator"))) + '("urxvt" "urxvtc") + '("rxvt-unicode" "rxvt-unicode (client)"))))))) (inputs (list libptytty libxft libx11 libxt libxext)) (native-inputs