unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Nicolas Goaziou via Guix-patches via <guix-patches@gnu.org>
To: Juliana Sims <juli@incana.org>
Cc: 69313@debbugs.gnu.org, Tobias Geerinckx-Rice <me@tobias.gr>,
	Wilko Meyer <w@wmeyer.eu>, Leo Famulari <leo@famulari.name>
Subject: [bug#69313] [PATCH] gnu: tlpui: Fix broken package.
Date: Thu, 22 Feb 2024 23:07:25 +0100	[thread overview]
Message-ID: <87il2gcfvm.fsf@nicolasgoaziou.fr> (raw)
In-Reply-To: <eb560602d63a60bd6a541cd682b5bea50f2ed8c6.1708632642.git.juli@incana.org> (Juliana Sims's message of "Thu, 22 Feb 2024 15:10:42 -0500")

Hello,

Juliana Sims <juli@incana.org> writes:

> * gnu/packages/linux.scm (tlpui): Fix broken package.

Thank you.


I think the commit message could be expounded a bit, e.g.,

  * gnu/packages/linux.scm (tlpui)[arguments]: Fix location for "defaults.conf".


>            (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")))

I'm a bit puzzled here: how does

  (search-input-file inputs "/share/tlp/defaults.conf")

differ from

  #$(file-append tlp "/share/tlp/defaults.conf")

?

And how does this relate to other changes in the patch (lsusb and lspci)?

>                  (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))

OOC, would this single line suffice to fix the issue? On my side, this
seems to be the case.

Regards,
-- 
Nicolas Goaziou






  reply	other threads:[~2024-02-22 22:08 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-22 20:10 [bug#69313] [PATCH] gnu: tlpui: Fix broken package Juliana Sims
2024-02-22 22:07 ` Nicolas Goaziou via Guix-patches via [this message]
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=87il2gcfvm.fsf@nicolasgoaziou.fr \
    --to=guix-patches@gnu.org \
    --cc=69313@debbugs.gnu.org \
    --cc=juli@incana.org \
    --cc=leo@famulari.name \
    --cc=mail@nicolasgoaziou.fr \
    --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).