From: Juliana Sims <juli@incana.org>
To: 69313@debbugs.gnu.org
Cc: Juliana Sims <juli@incana.org>, Leo Famulari <leo@famulari.name>,
Tobias Geerinckx-Rice <me@tobias.gr>, Wilko Meyer <w@wmeyer.eu>
Subject: [bug#69313] [PATCH] gnu: tlpui: Fix broken package.
Date: Thu, 22 Feb 2024 15:10:42 -0500 [thread overview]
Message-ID: <eb560602d63a60bd6a541cd682b5bea50f2ed8c6.1708632642.git.juli@incana.org> (raw)
Hello,
Before this patch, tlpui failed to launch with an error about failing to find
defaults.conf. This is a relatively simple patch to fix that.
Note that tlpui is also somewhat outdated. I started in on updating it, but
several dependencies were updated beyond what we have in Guix and I didn't feel
like navigating that and the changes in build and testing in the later releases.
Thanks,
Juli
* gnu/packages/linux.scm (tlpui): Fix broken package.
Change-Id: I451ba405fb6287b76e449dc6a63718dd36f623ff
---
gnu/packages/linux.scm | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8eb6d9b7d3..3aa02345b4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7868,18 +7868,17 @@ (define-public tlpui
(substitute* "setup.py"
(("/usr/") ""))))
(add-after 'unpack 'set-absolute-locations
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((defaults.conf
- (search-input-file inputs "/share/tlp/defaults.conf"))
- (lspci (search-input-file inputs "/bin/lspci"))
- (lsusb (search-input-file inputs "/bin/lsusb"))
- (tlp-stat (search-input-file inputs "/bin/tlp-stat")))
+ (lambda _
+ (let ((defaults.conf #$(file-append tlp "/share/tlp/defaults.conf"))
+ (lspci #$(file-append pciutils "/bin/lspci"))
+ (lsusb #$(file-append usbutils "/bin/lsusb"))
+ (tlp-stat #$(file-append tlp "/bin/tlp-stat")))
(with-directory-excursion "tlpui"
(substitute* '("file.py" "settingshelper.py" "statui.py")
(("\"tlp-stat\"")
(string-append "'" tlp-stat "'"))
(("/usr/share/tlp/defaults.conf")
- (string-append "'" defaults.conf "'")))
+ defaults.conf))
(substitute* "ui_config_objects/gtkusblist.py"
(("\"lsusb\"")
(string-append "'" lsusb "'")))
base-commit: c97de01740ad336efba5830def0907f3daa9c0b8
--
2.41.0
next reply other threads:[~2024-02-22 20:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 20:10 Juliana Sims [this message]
2024-02-22 22:07 ` [bug#69313] [PATCH] gnu: tlpui: Fix broken package Nicolas Goaziou via Guix-patches via
2024-02-22 22:56 ` [bug#69313] [PATCH v2 0/2] gnu: tlpui: Fix location for "defaults.conf" Juliana Sims
2024-02-23 7:37 ` Nicolas Goaziou via Guix-patches via
2024-02-27 17:10 ` Juliana Sims
2024-02-22 22:56 ` [bug#69313] [PATCH v2 1/2] " Juliana Sims
2024-02-22 22:56 ` [bug#69313] [PATCH v2 2/2] gnu: tlpui: Reference inputs directly during build Juliana Sims
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=eb560602d63a60bd6a541cd682b5bea50f2ed8c6.1708632642.git.juli@incana.org \
--to=juli@incana.org \
--cc=69313@debbugs.gnu.org \
--cc=leo@famulari.name \
--cc=me@tobias.gr \
--cc=w@wmeyer.eu \
/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).