From: Hilton Chain via Guix-patches via <guix-patches@gnu.org>
To: 69430@debbugs.gnu.org
Cc: Hilton Chain <hako@ultrarare.space>
Subject: [bug#69430] [PATCH 2/2] gnu: sway: Update package style.
Date: Wed, 28 Feb 2024 00:08:45 +0800 [thread overview]
Message-ID: <4e0fe40cb9f4e6974520c36026a233fa300501e3.1709049313.git.hako@ultrarare.space> (raw)
In-Reply-To: <75e2cd50e71e8b3289a8493d1db94dbfbfa1ac63.1709049313.git.hako@ultrarare.space>
* gnu/packages/wm.scm (sway)[arguments]: Use gexps.
<#:phases>: Adjust to use ‘search-input-file’.
Remove trailing #t.
Change-Id: I5bd91faf2c79566486437b37cf72964d2c6a85fc
---
gnu/packages/wm.scm | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 90d61d1d86..e5bc434166 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1769,19 +1769,20 @@ (define-public sway
(base32 "1n36vgpi4bg2gkiq4fam4khly1z9bjinmjclzq5vfx0z8h7a5bzz"))))
(build-system meson-build-system)
(arguments
- `(;; elogind is propagated by wlroots -> libseat
- ;; and would otherwise shadow basu.
- #:configure-flags '("-Dsd-bus-provider=basu")
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'hardcode-paths
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Hardcode path to swaybg.
- (substitute* "sway/config.c"
- (("strdup..swaybg..")
- (string-append "strdup(\"" (assoc-ref inputs "swaybg")
- "/bin/swaybg\")")))
- #t)))))
+ (list
+ ;; elogind is propagated by wlroots -> libseat
+ ;; and would otherwise shadow basu.
+ #:configure-flags
+ #~'("-Dsd-bus-provider=basu")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'hardcode-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Hardcode path to swaybg.
+ (substitute* "sway/config.c"
+ (("strdup..swaybg..")
+ (format #f "strdup(\"~a\")"
+ (search-input-file inputs "bin/swaybg")))))))))
(inputs (list basu
cairo
gdk-pixbuf
--
2.41.0
next prev parent reply other threads:[~2024-02-27 16:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 15:56 [bug#69430] [PATCH 1/2] gnu: sway: Update to 1.9 Hilton Chain via Guix-patches via
2024-02-27 16:08 ` Hilton Chain via Guix-patches via [this message]
[not found] ` <handler.69430.B.170904997721643.ack@debbugs.gnu.org>
2024-03-09 3:19 ` bug#69430: Acknowledgement ([PATCH 1/2] gnu: sway: Update to 1.9.) Hilton Chain via Guix-patches via
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=4e0fe40cb9f4e6974520c36026a233fa300501e3.1709049313.git.hako@ultrarare.space \
--to=guix-patches@gnu.org \
--cc=69430@debbugs.gnu.org \
--cc=hako@ultrarare.space \
/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).