From: Timotej Lazar <timotej.lazar@araneo.si>
To: 64263@debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar@araneo.si>
Subject: [bug#64263] [PATCH 2/3] gnu: rxvt-unicode: Use new package style.
Date: Sat, 24 Jun 2023 13:28:04 +0200 [thread overview]
Message-ID: <8f685b067ba64216eef42b3135bb02386e8be15a.1687605773.git.timotej.lazar@araneo.si> (raw)
In-Reply-To: <cover.1687605773.git.timotej.lazar@araneo.si>
* 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))
--
2.40.1
next prev parent reply other threads:[~2023-06-24 11:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-24 11:25 [bug#64263] [PATCH 0/3] Update rxvt-unicode Timotej Lazar
2023-06-24 11:28 ` [bug#64263] [PATCH 1/3] gnu: rxvt-unicode: Update to 9.31 [fixes CVE-2022-4170] Timotej Lazar
2023-06-24 11:28 ` Timotej Lazar [this message]
2023-06-24 11:28 ` [bug#64263] [PATCH 3/3] gnu: rxvt-unicode: Use helper procedure to make desktop files Timotej Lazar
2023-07-11 14:07 ` bug#64263: [PATCH 0/3] Update rxvt-unicode Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8f685b067ba64216eef42b3135bb02386e8be15a.1687605773.git.timotej.lazar@araneo.si \
--to=timotej.lazar@araneo.si \
--cc=64263@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).