From: SeerLite via Guix-patches via <guix-patches@gnu.org>
To: 61975@debbugs.gnu.org
Cc: SeerLite <seerlite@disroot.org>
Subject: [bug#61975] [PATCH v2 2/2] gnu: i3-wm: Add missing inputs for i3-save-tree.
Date: Tue, 7 Mar 2023 00:44:58 -0300 [thread overview]
Message-ID: <20230307034458.21736-2-seerlite@disroot.org> (raw)
In-Reply-To: <20230307034458.21736-1-seerlite@disroot.org>
* gnu/packages/wm.scm (i3-wm)[inputs]: Add perl, perl-anyevent-i3,
perl-json-xs, perl-common-sense, and perl-types-serialiser.
[arguments]: Add phase to wrap i3-save-tree to use perl inputs listed above.
---
gnu/packages/wm.scm | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 3bdbc43c51..fe9a7b959d 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -332,12 +332,26 @@ (define-public i3-wm
#~(modify-phases %standard-phases
(add-after 'install 'patch-session-file
(lambda _
- (let* ((i3 (string-append #$output "/bin/i3"))
- (i3-with-shmlog (string-append #$output "/bin/i3-with-shmlog")))
+ (let ((i3 (string-append #$output "/bin/i3"))
+ (i3-with-shmlog (string-append #$output "/bin/i3-with-shmlog")))
(substitute* (string-append #$output "/share/xsessions/i3.desktop")
(("Exec=i3") (string-append "Exec=" i3)))
(substitute* (string-append #$output "/share/xsessions/i3-with-shmlog.desktop")
- (("Exec=i3-with-shmlog") (string-append "Exec=" i3-with-shmlog)))))))))
+ (("Exec=i3-with-shmlog") (string-append "Exec=" i3-with-shmlog))))))
+ (add-after 'patch-session-file 'wrap-perl-bin
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((i3-save-tree (string-append #$output "/bin/i3-save-tree"))
+ (perl-lib-names '("perl-anyevent"
+ "perl-anyevent-i3"
+ "perl-json-xs"
+ "perl-common-sense"
+ "perl-types-serialiser"))
+ (perl-lib-paths
+ (map (lambda (name)
+ (string-append (assoc-ref inputs name) "/lib/perl5/site_perl"))
+ perl-lib-names)))
+ (wrap-program i3-save-tree
+ `("PERL5LIB" ":" prefix ,perl-lib-paths))))))))
(inputs
(list libxcb
xcb-util
@@ -349,6 +363,11 @@ (define-public i3-wm
libev
yajl
xmlto
+ perl
+ perl-anyevent-i3
+ perl-json-xs
+ perl-common-sense
+ perl-types-serialiser
perl-pod-simple
libx11
pcre2
--
2.39.1
next prev parent reply other threads:[~2023-03-07 3:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-05 6:28 [bug#61975] [PATCH] gnu: i3-wm: Add missing propagated inputs SeerLite via Guix-patches via
2023-03-06 8:30 ` 宋文武 via Guix-patches via
2023-03-07 3:47 ` SeerLite via Guix-patches via
2023-03-07 3:44 ` [bug#61975] [PATCH v2 1/2] gnu: i3-wm: Use new package style SeerLite via Guix-patches via
2023-03-07 3:44 ` SeerLite via Guix-patches via [this message]
2023-06-09 21:00 ` bug#61975: [PATCH] gnu: i3-wm: Add missing propagated inputs 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=20230307034458.21736-2-seerlite@disroot.org \
--to=guix-patches@gnu.org \
--cc=61975@debbugs.gnu.org \
--cc=seerlite@disroot.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).