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